X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/6088ad861cbd43d277933c4e2c6dcd3cefb65f89..3d609928e5d166897f26d2afe1b39e518f67a22c:/IkiWiki/Plugin/edittemplate.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/edittemplate.pm b/IkiWiki/Plugin/edittemplate.pm
index 1fff03695..0bafc95d0 100644
--- a/IkiWiki/Plugin/edittemplate.pm
+++ b/IkiWiki/Plugin/edittemplate.pm
@@ -3,11 +3,11 @@ package IkiWiki::Plugin::edittemplate;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 use HTML::Template;
 use Encode;
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "edittemplate",
 		call => \&getsetup);
 	hook(type => "needsbuild", id => "edittemplate",
@@ -16,17 +16,17 @@ sub import { #{{{
 		call => \&preprocess);
 	hook(type => "formbuilder", id => "edittemplate",
 		call => \&formbuilder);
-} #}}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 1,
 			rebuild => undef,
 		},
-} #}}}
+}
 
-sub needsbuild (@) { #{{{
+sub needsbuild (@) {
 	my $needsbuild=shift;
 
 	foreach my $page (keys %pagestate) {
@@ -40,9 +40,9 @@ sub needsbuild (@) { #{{{
 			}
 		}
 	}
-} #}}}
+}
 
-sub preprocess (@) { #{{{
+sub preprocess (@) {
         my %params=@_;
 
 	return "" if $params{page} ne $params{destpage};
@@ -54,24 +54,22 @@ sub preprocess (@) { #{{{
 		error gettext("match not specified")
 	}
 
-	$pagestate{$params{page}}{edittemplate}{$params{match}}=$params{template};
+	my $link=linkpage($params{template});
+	$pagestate{$params{page}}{edittemplate}{$params{match}}=$link;
 
 	return "" if ($params{silent} && IkiWiki::yesno($params{silent}));
-
-	my $link=IkiWiki::linkpage($params{template});
 	add_depends($params{page}, $link);
-	my $linkHTML = htmllink($params{page}, $params{destpage}, $link);
-
 	return sprintf(gettext("edittemplate %s registered for %s"),
-		$linkHTML, $params{match});
-} # }}}
+		htmllink($params{page}, $params{destpage}, $link),
+	       	$params{match});
+}
 
-sub formbuilder (@) { #{{{
+sub formbuilder (@) {
 	my %params=@_;
 	my $form=$params{form};
 
 	return if $form->field("do") ne "create" ||
-		length $form->field("editcontent");
+		(defined $form->field("editcontent") && length $form->field("editcontent"));
 	
 	my $page=$form->field("page");
 	
@@ -93,20 +91,21 @@ sub formbuilder (@) { #{{{
 			if (exists $pagestate{$registering_page}{edittemplate}) {
 				foreach my $pagespec (sort keys %{$pagestate{$registering_page}{edittemplate}}) {
 					if (pagespec_match($p, $pagespec, location => $registering_page)) {
+						my $template=$pagestate{$registering_page}{edittemplate}{$pagespec};
 						$form->field(name => "editcontent",
-							 value => filltemplate($pagestate{$registering_page}{edittemplate}{$pagespec}, $page));
+							 value =>  filltemplate($template, $page));
 						$form->field(name => "type",
-							 value => pagetype($pagesources{$pagestate{$registering_page}{edittemplate}{$pagespec}}))
-								if $pagesources{$pagestate{$registering_page}{edittemplate}{$pagespec}};
+							 value => pagetype($pagesources{$template}))
+								if $pagesources{$template};
 						return;
 					}
 				}
 			}
 		}
 	}
-} #}}}
+}
 
-sub filltemplate ($$) { #{{{
+sub filltemplate ($$) {
 	my $template_page=shift;
 	my $page=shift;
 
@@ -137,6 +136,6 @@ sub filltemplate ($$) { #{{{
 	$template->param(name => $page);
 
 	return $template->output;
-} #}}}
+}
 
 1