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

diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm
index ad3247f4bf5b0c00b3cfa7b1c137411aedabef7c..24b16fe2a78c4607f89788cd78ea1d7e5a1ac137 100644 (file)
--- a/IkiWiki/Plugin/search.pm
+++ b/IkiWiki/Plugin/search.pm
@@ -188,7 +188,7 @@ sub cgi ($) {
 
        if (defined $cgi->param('P')) {
                if ($config{google_search}) {
-                       print $cgi->redirect("https://www.google.com/search?sitesearch=$config{cgiurl}&q=".$cgi->param('P'));
+                       print $cgi->redirect("https://www.google.com/search?sitesearch=$config{url}&q=".$cgi->param('P'));
                        exit 0;
                }
                else {

diff --git a/debian/changelog b/debian/changelog
index ce8f833fb45f8e5c21f7de5c5345a3ea6ce27021..8de2291758d8eea7dc49001bec8e0667f0cb62f2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,7 +12,7 @@ ikiwiki (3.20130904.2) UNRELEASED; urgency=low
     break some setups where not all files get committed to git.
   * comments: Write pending moderation comments to the transient underlay
     to avoid conflict with only_committed_changes.
-  * search: Added googlesearch option, which makes it search google
+  * search: Added google_search option, which makes it search google
     rather than using the internal xapain database.
     (googlesearch plugin is too hard to turn on when xapain databases
     corrupt themselves, which happens all too frequently).