]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/blobdiff - IkiWiki/Plugin/edittemplate.pm
another cvs bugfix on my branch
[git.ikiwiki.info.git] / IkiWiki / Plugin / edittemplate.pm
index 4f07866e443c61ff73e778620e691d85c81f2084..c7f1e4fa7f7117660b5d89207a1795caec9fc6af 100644 (file)
@@ -107,9 +107,11 @@ sub formbuilder (@) {
                                                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};
+                                               $form->field(name => "type",
+                                                        value => $type)
+                                                               if defined $type;
                                                return;
                                        }
                                }
@@ -130,10 +132,7 @@ sub filltemplate ($$) {
        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);