From: Joey Hess Date: Sat, 27 Sep 2008 19:18:36 +0000 (-0400) Subject: template: Make edit link for new templates ensure the page is located under toplevel... X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/55a0361a4768c445216d93314a707dcbd9bc98c7?hp=67f38832aac247620f29fc124cfce31dd616f119 template: Make edit link for new templates ensure the page is located under toplevel templates directory. --- diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm index a2859b2a9..c980df48f 100644 --- 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"), - htmllink($params{page}, $params{destpage}, $template_page)) + htmllink($params{page}, $params{destpage}, "/".$template_page)) unless defined $template_file; my $template; diff --git a/debian/changelog b/debian/changelog index 8c52c3a29..1483bec64 100644 --- 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. + * 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