Merge branch 'master' into debian-jessie-backports

[git.ikiwiki.info.git] / IkiWiki / Plugin / search.pm

diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm
index ad3247f4bf5b0c00b3cfa7b1c137411aedabef7c..f9193b6aad5f4d4cbd385d9fb18e586436654679 100644 (file)
--- a/IkiWiki/Plugin/search.pm
+++ b/IkiWiki/Plugin/search.pm
@@ -34,7 +34,7 @@ sub getsetup () {
                        rebuild => 0,
                },
                google_search => {
                        rebuild => 0,
                },
                google_search => {

-                       type => "booblean",
+                       type => "boolean",

                        example => 1,
                        description => "use google site search rather than internal xapian index?",
                        safe => 1,
                        example => 1,
                        description => "use google site search rather than internal xapian index?",
                        safe => 1,


@@ -188,7 +188,7 @@ sub cgi ($) {
 
        if (defined $cgi->param('P')) {
                if ($config{google_search}) {
 
        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 {
                        exit 0;
                }
                else {