[wellwell-devel] [wellwell] Add object function to [wiki] tag.

Stefan Hornburg wellwell-devel at rt.icdevgroup.org
Thu Jun 10 18:42:11 UTC 2010


commit c323b7e755dd1c76c2fb439502a728967fe6fa45
Author: Stefan Hornburg (Racke) <racke at linuxia.de>
Date:   Thu Jun 10 16:52:51 2010 +0200

    Add object function to [wiki] tag.
    Wiki action now initializes wiki in order to use front_page setting.

 lib/Vend/Wiki.pm |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/lib/Vend/Wiki.pm b/lib/Vend/Wiki.pm
index 91aa21e..5f8d611 100644
--- a/lib/Vend/Wiki.pm
+++ b/lib/Vend/Wiki.pm
@@ -154,6 +154,10 @@ sub wiki {
 	}
 
 	$wiki{$name}->{page} = $page;
+
+	if ($function eq 'object') {
+		return $wiki{$name};
+	}
 	
 	if ($function eq 'create_page') {
 		my $metadata = $wiki{$name}->metadata_from_form();
@@ -545,7 +549,7 @@ sub load_plugin {
 # default ActionMap for wiki
 sub action {
  	my ($path) = @_;
-	my ($action, $url, $page, $name, $key, $value);
+	my ($action, $url, $page, $name, $key, $value, $wiki);
 	
  	($action, $url) = split(m{/+}, $path, 2);
 
@@ -567,12 +571,14 @@ sub action {
 		}
 	}
 
+	$wiki = wiki('object', '', '', {name => $name});
+
 	# provide default for target page
 	$page ||= 'wiki';
 
 	# pass wiki parameters to page
 	$CGI::values{name} = $name;
-	$CGI::values{page} ||= $url;
+	$CGI::values{page} ||= $url || $wiki->{front_page};
 
 	if ($CGI::values{action} eq 'edit' && ! wiki('exists', $CGI::values{page})) {
 		# Wiki::Toolkit doesn't distinguish between create and edit



More information about the wellwell-devel mailing list