diff options
| author | Joey Hess <joey@gnu.kitenet.net> | 2009-10-18 13:47:30 -0400 |
|---|---|---|
| committer | Joey Hess <joey@gnu.kitenet.net> | 2009-10-18 13:47:30 -0400 |
| commit | d1a88c892ea1786e3f8451d0ef9069be9358e332 (patch) | |
| tree | 999488147b26094aafef3f3a6c5f2209f6716fc3 | |
| parent | 967c845e473a34ac5c3b112f53a7721d029204a4 (diff) | |
edittemplate: Allow template page name to be specified using anything legal for a wikilink (including eg, leading slashes).
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.
| -rw-r--r-- | IkiWiki/Plugin/edittemplate.pm | 3 | ||||
| -rw-r--r-- | debian/changelog | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/IkiWiki/Plugin/edittemplate.pm b/IkiWiki/Plugin/edittemplate.pm index 7d2eba194..e8e7b1e04 100644 --- 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 7da20a3f7..81935f998 100644 --- 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 |