aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2011-09-01 11:38:10 -0400
committerJoey Hess <joey@kitenet.net>2011-09-01 11:38:10 -0400
commit7d2b68cd16dd50a76b3b93699e59b7ec4c00a907 (patch)
treef3dd8dfcf0d4ec6ec61fc0f60563929f710d4210
parent2c2c537dd521bbc659f0499af72ca70078d97d50 (diff)
downloadikiwiki-7d2b68cd16dd50a76b3b93699e59b7ec4c00a907.tar
ikiwiki-7d2b68cd16dd50a76b3b93699e59b7ec4c00a907.tar.gz
inline: When indexing internal pages for searching, use the url of the inlining page.
-rw-r--r--IkiWiki/Plugin/inline.pm2
-rw-r--r--debian/changelog2
2 files changed, 3 insertions, 1 deletions
diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 77634066b..159cc5def 100644
--- 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 5295030d5..06f07b217 100644
--- 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