X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/ea4967f184bf0a27eaa2dc81da1084780756156a..8496dd9fb405eda149995615ead0a94a83298b91:/IkiWiki/Plugin/search.pm

diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm
index c578b44ab..ff5d0ccbe 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".
@@ -223,7 +228,9 @@ sub setupfiles () {
 		
 		# Avoid omega interpreting anything in the misctemplate
 		# as an omegascript command.
-		my $misctemplate=IkiWiki::misctemplate(gettext("search"), "\0");
+		my $misctemplate=IkiWiki::misctemplate(gettext("search"), "\0",
+			searchform => "", # avoid showing the small search form
+		);
 		eval q{use HTML::Entities};
 		error $@ if $@;
 		$misctemplate=encode_entities($misctemplate, '\$');