aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2010-05-06 23:28:40 -0400
committerJoey Hess <joey@kitenet.net>2010-05-06 23:28:40 -0400
commit575080d6ef114f24e23c17bd63cf406b22460657 (patch)
treec6579b3d4c8af83fb59f4c28eed2128d8e29f123
parent14826ad92792b4870108dac3c28840abe1e00428 (diff)
downloadikiwiki-575080d6ef114f24e23c17bd63cf406b22460657.tar
ikiwiki-575080d6ef114f24e23c17bd63cf406b22460657.tar.gz
respect permalinks
-rw-r--r--IkiWiki/Plugin/search.pm7
1 files changed, 6 insertions, 1 deletions
diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm
index c578b44ab..cc26b7ac1 100644
--- a/IkiWiki/Plugin/search.pm
+++ b/IkiWiki/Plugin/search.pm
@@ -112,12 +112,17 @@ sub indexhtml (@) {
}
$sample=~s/\n/ /g;
+ my $url=urlto($params{destpage}, "");
+ if (defined $pagestate{$params{page}}{meta}{permalink}) {
+ $url=$pagestate{$params{page}}{meta}{permalink}
+ }
+
# data used by omega
# Decode html entities in it, since omega re-encodes them.
eval q{use HTML::Entities};
error $@ if $@;
$doc->set_data(
- "url=".urlto($params{destpage}, "")."\n".
+ "url=".$url."\n".
"sample=".decode_entities($sample)."\n".
"caption=".decode_entities($caption)."\n".
"modtime=$IkiWiki::pagemtime{$params{page}}\n".