template: Make edit link for new templates ensure the page is located under toplevel...

diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm
index a2859b2a99864ddb0e9d33cea8106b46ffbc8775..c980df48f4a48dfa8100fefa341740a2028244eb 100644 (file)
--- a/IkiWiki/Plugin/template.pm
+++ b/IkiWiki/Plugin/template.pm
@@ -33,7 +33,7 @@ sub preprocess (@) { #{{{
 
        my $template_file=$pagesources{$template_page};
        return sprintf(gettext("template %s not found"),
 
        my $template_file=$pagesources{$template_page};
        return sprintf(gettext("template %s not found"),

-               htmllink($params{page}, $params{destpage}, $template_page))
+               htmllink($params{page}, $params{destpage}, "/".$template_page))

                        unless defined $template_file;
 
        my $template;
                        unless defined $template_file;
 
        my $template;

diff --git a/debian/changelog b/debian/changelog
index 8c52c3a29aea5fe44f5986b013f41b05f4df312e..1483bec64ffb439f231883a694567bad768cf26a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ ikiwiki (2.66) UNRELEASED; urgency=low
   * git: Fix handling of utf-8 filenames in recentchanges.
   * tag: Make edit link for new tags ensure that the tags are created
     inside tagbase, when it's set.
   * git: Fix handling of utf-8 filenames in recentchanges.
   * tag: Make edit link for new tags ensure that the tags are created
     inside tagbase, when it's set.

+  * template: Make edit link for new templates ensure the page is located
+    under toplevel templates directory.

   * htmlscrubber: Add a config setting that can be used to disable the
     scrubber acting on a set of pages.
   * Expand usage message and add --help. Closes: #500344
   * htmlscrubber: Add a config setting that can be used to disable the
     scrubber acting on a set of pages.
   * Expand usage message and add --help. Closes: #500344