Merge branch 'master' into debian-jessie-backports

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

diff --git a/IkiWiki/Plugin/google.pm b/IkiWiki/Plugin/google.pm
index 68cb16513c69812c47443ad2377c091e4d17037e..68cde261c66748c5d32475657986ce9d465fbbbf 100644 (file)
--- a/IkiWiki/Plugin/google.pm
+++ b/IkiWiki/Plugin/google.pm
@@ -25,6 +25,10 @@ sub checkconfig () {
        if (! length $config{url}) {
                error(sprintf(gettext("Must specify %s when using the %s plugin"), "url", 'google'));
        }
        if (! length $config{url}) {
                error(sprintf(gettext("Must specify %s when using the %s plugin"), "url", 'google'));
        }

+       
+       # This is a mass dependency, so if the search form template
+       # changes, every page is rebuilt.
+       add_depends("", "templates/googleform.tmpl");

 }
 
 my $form;
 }
 
 my $form;


@@ -36,8 +40,9 @@ sub pagetemplate (@) {
        # Add search box to page header.
        if ($template->query(name => "searchform")) {
                if (! defined $form) {
        # Add search box to page header.
        if ($template->query(name => "searchform")) {
                if (! defined $form) {

-                       my $searchform = template_depends("googleform.tmpl", $page, blind_cache => 1);
+                       my $searchform = template("googleform.tmpl", blind_cache => 1);

                        $searchform->param(url => $config{url});
                        $searchform->param(url => $config{url});

+                       $searchform->param(html5 => $config{html5});

                        $form=$searchform->output;
                }
 
                        $form=$searchform->output;
                }