Merge commit 'upstream/master' into pub/master

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

diff --git a/IkiWiki/Plugin/favicon.pm b/IkiWiki/Plugin/favicon.pm
index 518d2c2ff4f26ed13da55b5f73634ff0e050197c..e9204dea9fbf1841b386c87b107e33bf0bbfd603 100644 (file)
--- a/IkiWiki/Plugin/favicon.pm
+++ b/IkiWiki/Plugin/favicon.pm
@@ -5,19 +5,28 @@ package IkiWiki::Plugin::favicon;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki;
+use IkiWiki 2.00;

 
 sub import { #{{{
 
 sub import { #{{{

+       hook(type => "getsetup", id => "favicon", call => \&getsetup);

        hook(type => "pagetemplate", id => "favicon", call => \&pagetemplate);
 } # }}}
 
        hook(type => "pagetemplate", id => "favicon", call => \&pagetemplate);
 } # }}}
 

+sub getsetup () { #{{{
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => 1,
+               },
+} #}}}
+

 sub pagetemplate (@) { #{{{
        my %params=@_;
 
        my $template=$params{template};
        
        if ($template->query(name => "favicon")) {
 sub pagetemplate (@) { #{{{
        my %params=@_;
 
        my $template=$params{template};
        
        if ($template->query(name => "favicon")) {

-               $template->param(favicon => "favicon.png");
+               $template->param(favicon => "favicon.ico");

        }
 } # }}}
 
        }
 } # }}}