[wellwell-devel] [SCM] Interchange wellwell catalog branch, master, updated. e221f30e1c10c28142d45cbc9eb4f1164b810a17

[Stefan Hornburg]

       via  e221f30e1c10c28142d45cbc9eb4f1164b810a17 (commit)
       via  a5d437c915dd708d44c6cc1f99f5d8d4fa7e3828 (commit)
      from  564780fbfb0fbb09749039a6ee59d2e5e4afccaa (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e221f30e1c10c28142d45cbc9eb4f1164b810a17
Author: Stefan Hornburg (Racke) <racke at linuxia.de>
Date:   Thu Jun 3 11:31:42 2010 +0200

    UseMod formatter uses separate parameter for edit prefix.

commit a5d437c915dd708d44c6cc1f99f5d8d4fa7e3828
Author: Stefan Hornburg (Racke) <racke at linuxia.de>
Date:   Thu Jun 3 11:30:08 2010 +0200

    Catalog configuration overrides default menu entries.

-----------------------------------------------------------------------

Summary of changes and diff:
 lib/Vend/Wiki.pm |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/Vend/Wiki.pm b/lib/Vend/Wiki.pm
index 22af6ec..8fca200 100644
--- a/lib/Vend/Wiki.pm
+++ b/lib/Vend/Wiki.pm
@@ -495,14 +495,17 @@ sub load_store {
 # load formatter
 sub load_formatter {
 	my ($self, $fmt) = @_;
+	my ($edit_prefix);
 
 	eval "require $fmt->{class}";
 	if ($@) {
 		die "Failed to load $fmt->{class}: $@\n";
 	}
 	eval {
+		$edit_prefix = join($Global::UrlSepChar, '?action=edit', 'page=');
 		$fmt->{object} = $fmt->{class}->new (store => $self->{store},
-											 node_prefix => '?page=');
+											 node_prefix => '?page=',
+											 edit_prefix => $edit_prefix);
 	};
 	if ($@) {
 		die "Failed to instantiate $fmt->{class}: $@\n";
@@ -634,7 +637,7 @@ sub parse_wiki {
 
 		@entries = split(/\s*,\s*/, $args[0]);
 
-		push(@{$C->{$item}->{$name}->{$param}->{$value}}, @entries);
+		$C->{$item}->{$name}->{$param}->{$value} = \@entries;
 	}
 	elsif ($param eq 'metadata') {
 		if (exists $metadata_reserved{$value}) {


hooks/post-receive
-- 
Interchange wellwell catalog