]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/blobdiff - IkiWiki/Plugin/edittemplate.pm
Merge branch 'master' of ssh://git.ikiwiki.info
[git.ikiwiki.info.git] / IkiWiki / Plugin / edittemplate.pm
index 742413c94583a761ec6c180735444882ae343e41..061242fd82c1f1a76251dac12f8017821688a2a1 100644 (file)
@@ -41,6 +41,8 @@ sub needsbuild (@) {
                        }
                }
        }
+
+       return $needsbuild;
 }
 
 sub preprocess (@) {
@@ -56,10 +58,15 @@ sub preprocess (@) {
        }
 
        my $link=linkpage($params{template});
+       add_depends($params{page}, $link, deptype("presence"));
        my $bestlink=bestlink($params{page}, $link);
+       if (! length $bestlink) {
+               add_depends($params{page}, "templates/$link", deptype("presence"));
+               $link="/templates/".$link;
+               $bestlink=bestlink($params{page}, $link);
+       }
        $pagestate{$params{page}}{edittemplate}{$params{match}}=$bestlink;
 
-       add_depends($params{page}, $link, deptype("presence"));
        return "" if ($params{silent} && IkiWiki::yesno($params{silent})) &&
                length $bestlink;
        return sprintf(gettext("edittemplate %s registered for %s"),
@@ -100,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;
                                        }
                                }
@@ -125,9 +134,6 @@ sub filltemplate ($$) {
                # up a template that doesn't work.
                return "[[!pagetemplate ".gettext("failed to process template:")." $@]]";
        }
-       if (! defined $template) {
-               return;
-       }
 
        $template->param(name => $page);