summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-09-27 15:18:36 -0400
committerJoey Hess <joey@kodama.kitenet.net>2008-09-27 15:18:36 -0400
commit55a0361a4768c445216d93314a707dcbd9bc98c7 (patch)
tree83465bc8582259901ce31c0b8fd4ca126e0af35e
parent67f38832aac247620f29fc124cfce31dd616f119 (diff)
template: Make edit link for new templates ensure the page is located under toplevel templates directory.
-rw-r--r--IkiWiki/Plugin/template.pm2
-rw-r--r--debian/changelog2
2 files changed, 3 insertions, 1 deletions
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