Merge branch 'master' into templatemove

[ikiwiki.git] / IkiWiki / Plugin / google.pm

diff --git a/IkiWiki/Plugin/google.pm b/IkiWiki/Plugin/google.pm
index 1683220e7ed659c8857ae2aae0fcf8ff966969f7..68cb16513c69812c47443ad2377c091e4d17037e 100644 (file)
--- a/IkiWiki/Plugin/google.pm
+++ b/IkiWiki/Plugin/google.pm
@@ -6,8 +6,6 @@ use strict;
 use IkiWiki 3.00;
 use URI;
 
-my $host;
-
 sub import {
        hook(type => "getsetup", id => "google", call => \&getsetup);
        hook(type => "checkconfig", id => "google", call => \&checkconfig);
@@ -19,6 +17,7 @@ sub getsetup () {
                plugin => {
                        safe => 1,
                        rebuild => 1,
+                       section => "web",
                },
 }
 
@@ -26,11 +25,6 @@ sub checkconfig () {
        if (! length $config{url}) {
                error(sprintf(gettext("Must specify %s when using the %s plugin"), "url", 'google'));
        }
-       my $uri=URI->new($config{url});
-       if (! $uri || ! defined $uri->host) {
-               error(gettext("Failed to parse url, cannot determine domain name"));
-       }
-       $host=$uri->host;
 }
 
 my $form;
@@ -42,8 +36,8 @@ sub pagetemplate (@) {
        # Add search box to page header.
        if ($template->query(name => "searchform")) {
                if (! defined $form) {
-                       my $searchform = template("googleform.tmpl", blind_cache => 1);
-                       $searchform->param(sitefqdn => $host);
+                       my $searchform = template_depends("googleform.tmpl", $page, blind_cache => 1);
+                       $searchform->param(url => $config{url});
                        $form=$searchform->output;
                }