edittemplate: Allow template page name to be specified using anything legal for a...

Before, the htmllink would display the link to the template as if it were a
wikilink, but what was stored was not, which could lead to confusing
situations.

diff --git a/IkiWiki/Plugin/edittemplate.pm b/IkiWiki/Plugin/edittemplate.pm
index 7d2eba194537857cb1088a90e2a4afa82009b507..e8e7b1e04b286739fb55ba40f81ddc8c913ac304 100644 (file)
--- a/IkiWiki/Plugin/edittemplate.pm
+++ b/IkiWiki/Plugin/edittemplate.pm
@@ -55,7 +55,8 @@ sub preprocess (@) {
        }
 
        my $link=linkpage($params{template});
-       $pagestate{$params{page}}{edittemplate}{$params{match}}=$link;
+       my $bestlink=bestlink($params{page}, $link);
+       $pagestate{$params{page}}{edittemplate}{$params{match}}=$bestlink;
 
        return "" if ($params{silent} && IkiWiki::yesno($params{silent}));
        add_depends($params{page}, $link, deptype("presence"));

diff --git a/debian/changelog b/debian/changelog
index 7da20a3f7983adc7144b7ca86c2494c102458ed2..81935f9983d82b5ca16223e72695ccc1b5094438 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ikiwiki (3.20091018) UNRELEASED; urgency=low
+
+  * edittemplate: Allow template page name to be specified using anything
+    legal for a wikilink (including eg, leading slashes).
+
+ -- Joey Hess <joeyh@debian.org>  Sun, 18 Oct 2009 13:44:09 -0400
+
 ikiwiki (3.20091017) unstable; urgency=low
 
   * Added support framework for multiple types of dependencies, including