diff options
| author | intrigeri <intrigeri@boum.org> | 2010-12-20 14:27:21 +0100 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2010-12-20 14:27:21 +0100 |
| commit | 75196e76b627709a6ecae3fa948e1fba7928a5ce (patch) | |
| tree | 6aa2baeb9cc68f98ca256ce0ff5cb20909f52ef9 /IkiWiki/Plugin/search.pm | |
| parent | 8c2962ec48ae57605d6d0e297be437a97b6229ca (diff) | |
| parent | e5ed3c9e3801360cc00ce4f4f325f68ac0770bff (diff) | |
Merge remote branch 'upstream/master' into prv/po
Diffstat (limited to 'IkiWiki/Plugin/search.pm')
| -rw-r--r-- | IkiWiki/Plugin/search.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm index 8fb9dff0c..78eb750b5 100644 --- a/IkiWiki/Plugin/search.pm +++ b/IkiWiki/Plugin/search.pm @@ -58,7 +58,7 @@ sub pagetemplate (@) { if ($template->query(name => "searchform")) { if (! defined $form) { my $searchform = template("searchform.tmpl", blind_cache => 1); - $searchform->param(searchaction => $config{cgiurl}); + $searchform->param(searchaction => IkiWiki::cgiurl()); $searchform->param(html5 => $config{html5}); $form=$searchform->output; } @@ -176,7 +176,7 @@ sub cgi ($) { # only works for GET requests chdir("$config{wikistatedir}/xapian") || error("chdir: $!"); $ENV{OMEGA_CONFIG_FILE}="./omega.conf"; - $ENV{CGIURL}=$config{cgiurl}, + $ENV{CGIURL}=IkiWiki::cgiurl(); IkiWiki::loadindex(); $ENV{HELPLINK}=htmllink("", "", "ikiwiki/searching", noimageinline => 1, linktext => "Help"); |