Merge commit 'upstream/master' into pub/master

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

diff --git a/IkiWiki/Plugin/mirrorlist.pm b/IkiWiki/Plugin/mirrorlist.pm
index eb273561db4cec5769a7b623f7377bbcd8cea1d8..aab60c435d271d60568f6824bcbfe684e3853ac6 100644 (file)
--- a/IkiWiki/Plugin/mirrorlist.pm
+++ b/IkiWiki/Plugin/mirrorlist.pm
@@ -12,9 +12,13 @@ sub import { #{{{
 
 sub getsetup () { #{{{
        return
+               plugin => {
+                       safe => 1,
+                       rebuild => 1,
+               },
                mirrorlist => {
                        type => "string",
-                       default => {},
+                       example => {},
                        description => "list of mirrors",
                        safe => 1,
                        rebuild => 1,
@@ -25,8 +29,11 @@ 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 ($) { #{{{