* Fix another destpage issue in the inline directive. Closes: #385512

  again.

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 8ceaa95e09f0f491401248716dc365ddd73a41b5..70d5be2353665b574752d3b23109150e0ece9340 100644 (file)
--- 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 b4c362ff51254b8eac47306b45d338e4d824d2bf..a79158a4d226fa3f679cf398ab3880e3693a9747 100644 (file)
--- 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