just so it easily findable on my homepage

[git.ikiwiki.info.git] / IkiWiki / Plugin / edittemplate.pm

diff --git a/IkiWiki/Plugin/edittemplate.pm b/IkiWiki/Plugin/edittemplate.pm
index 226f83bb4bdfc6dfb11dd326fd6db9d02aae8eae..c7f1e4fa7f7117660b5d89207a1795caec9fc6af 100644 (file)
--- a/IkiWiki/Plugin/edittemplate.pm
+++ b/IkiWiki/Plugin/edittemplate.pm
@@ -41,6 +41,8 @@ sub needsbuild (@) {
                        }
                }
        }
                        }
                }
        }

+
+       return $needsbuild;

 }
 
 sub preprocess (@) {
 }
 
 sub preprocess (@) {


@@ -105,9 +107,11 @@ sub formbuilder (@) {
                                                my $template=$pagestate{$registering_page}{edittemplate}{$pagespec};
                                                $form->field(name => "editcontent",
                                                         value =>  filltemplate($template, $page));
                                                my $template=$pagestate{$registering_page}{edittemplate}{$pagespec};
                                                $form->field(name => "editcontent",
                                                         value =>  filltemplate($template, $page));

-                                               $form->field(name => "type",
-                                                        value => pagetype($pagesources{$template}))
+                                               my $type=pagetype($pagesources{$template})

                                                                if $pagesources{$template};
                                                                if $pagesources{$template};

+                                               $form->field(name => "type",
+                                                        value => $type)
+                                                               if defined $type;

                                                return;
                                        }
                                }
                                                return;
                                        }
                                }


@@ -128,10 +132,7 @@ sub filltemplate ($$) {
        if ($@) {
                # Indicate that the earlier preprocessor directive set 
                # up a template that doesn't work.
        if ($@) {
                # Indicate that the earlier preprocessor directive set 
                # up a template that doesn't work.

-               return "[[!pagetemplate ".gettext("failed to process template:")." $@]]";
-       }
-       if (! defined $template) {
-               return;
+               return "[[!edittemplate ".gettext("failed to process template:")." $@]]";

        }
 
        $template->param(name => $page);
        }
 
        $template->param(name => $page);