diff options
| author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-09-03 19:54:44 +0000 |
|---|---|---|
| committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-09-03 19:54:44 +0000 |
| commit | f0393523c80d637fb8f5e4f0d6c3d64a18487e90 (patch) | |
| tree | bcacbc2eb1851f781729f48c53e0893a2d2b6fcd | |
| parent | 92065444d982a443d3862f9ce5094bd32faffb85 (diff) | |
| download | ikiwiki-f0393523c80d637fb8f5e4f0d6c3d64a18487e90.tar ikiwiki-f0393523c80d637fb8f5e4f0d6c3d64a18487e90.tar.gz | |
* Fix another destpage issue in the inline directive. Closes: #385512
again.
| -rw-r--r-- | IkiWiki/Plugin/inline.pm | 2 | ||||
| -rw-r--r-- | debian/changelog | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm index 8ceaa95e0..70d5be235 100644 --- a/IkiWiki/Plugin/inline.pm +++ b/IkiWiki/Plugin/inline.pm @@ -99,7 +99,7 @@ sub preprocess_inline (@) { #{{{ # Don't use htmllink because this way the title is separate # and can be overridden by other plugins. my $link=htmlpage(bestlink($params{page}, $page)); - $link=abs2rel($link, dirname($params{page})); + $link=abs2rel($link, dirname($params{destpage})); $template->param(pageurl => $link); $template->param(title => pagetitle(basename($page))); $template->param(content => $content); diff --git a/debian/changelog b/debian/changelog index b4c362ff5..a79158a4d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,10 @@ ikiwiki (1.24) UNRELEASED; urgency=low * Simplify the data structure returned by rcs_recentchanges to avoid each rcs plugin needing to form complex strings on its own. + * Fix another destpage issue in the inline directive. Closes: #385512 + again. - -- Joey Hess <joeyh@debian.org> Sun, 3 Sep 2006 13:32:34 -0400 + -- Joey Hess <joeyh@debian.org> Sun, 3 Sep 2006 15:45:58 -0400 ikiwiki (1.23) unstable; urgency=low |