Merge branch 'master' into debian-jessie-backports

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

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

-use IkiWiki;
+use IkiWiki 3.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 pagetemplate (@) { #{{{
+sub getsetup () {
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => 1,
+               },
+}
+
+sub pagetemplate (@) {

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

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

        }
        }

-} # }}}
+}

 
 1
 
 1