Merge branch 'master' of ssh://git.ikiwiki.info

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 77634066b795c94151c609b1ec7c8dd063da672d..159cc5def01d59aaa3f532cbb4fea14ab52f6435 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -506,7 +506,7 @@ sub get_inline_content ($$) {
                if (isinternal($page)) {
                        # make inlined text of internal pages searchable
                        run_hooks(indexhtml => sub {
-                               shift->(page => $page, destpage => $page,
+                               shift->(page => $page, destpage => $destpage,
                                        content => $ret);
                        });
                }

diff --git a/debian/changelog b/debian/changelog
index 5295030d56b5c690ce3ee3248ad8968d19a8c902..06f07b2171541f8d6c3d7af2db9c2c2e7fcfd80f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,8 @@ ikiwiki (3.20110716) UNRELEASED; urgency=low
   * Use lockf rather than flock when taking the cgilock, for better
     portability.
   * search: Fix encoding bug in calculation of maximum term size.
+  * inline: When indexing internal pages for searching, use the url of
+    the inlining page.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 19 Jul 2011 11:22:52 -0400