Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

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

diff --git a/IkiWiki/Plugin/mirrorlist.pm b/IkiWiki/Plugin/mirrorlist.pm
index 7e53fe068546488518a79c13365d3c1ee21c45da..737dcf767379e69819bc71c4f7d02800be5b62f6 100644 (file)
--- a/IkiWiki/Plugin/mirrorlist.pm
+++ b/IkiWiki/Plugin/mirrorlist.pm
@@ -3,14 +3,14 @@ package IkiWiki::Plugin::mirrorlist;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
-sub import { #{{{
+sub import {
        hook(type => "getsetup", id => "mirrorlist", call => \&getsetup);
        hook(type => "pagetemplate", id => "mirrorlist", call => \&pagetemplate);
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
        return
                plugin => {
                        safe => 1,
@@ -23,17 +23,20 @@ sub getsetup () { #{{{
                        safe => 1,
                        rebuild => 1,
                },
-} #}}}
+}
 
-sub pagetemplate (@) { #{{{
+sub pagetemplate (@) {
        my %params=@_;
         my $template=$params{template};
        
-       $template->param(extrafooter => mirrorlist($params{page}))
-               if $template->query(name => "extrafooter");
-} # }}}
+       if ($template->query(name => "extrafooter")) {
+               my $value=$template->param("extrafooter");
+               $value.=mirrorlist($params{page});
+               $template->param(extrafooter => $value);
+       }
+}
 
-sub mirrorlist ($) { #{{{
+sub mirrorlist ($) {
        my $page=shift;
        return "<p>".
                (keys %{$config{mirrorlist}} > 1 ? gettext("Mirrors") : gettext("Mirror")).
@@ -46,6 +49,6 @@ sub mirrorlist ($) { #{{{
                        } keys %{$config{mirrorlist}}
                ).
                "</p>";
-} # }}}
+}
 
 1