cherry-pick uri security fix

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

diff --git a/IkiWiki/Plugin/prettydate.pm b/IkiWiki/Plugin/prettydate.pm
index 18ddb94038361ce02ef25517e2496a54306a6a28..745e6a1de436e2db15b97ebe897858f891de2a51 100644 (file)
--- a/IkiWiki/Plugin/prettydate.pm
+++ b/IkiWiki/Plugin/prettydate.pm
@@ -40,7 +40,7 @@ sub default_timetable {
 }
 
 sub import { #{{{
 }
 
 sub import { #{{{

-       hook(type => "checkconfig", id => "skeleton", call => \&checkconfig);
+       hook(type => "checkconfig", id => "prettydate", call => \&checkconfig);

 } # }}}
 
 sub checkconfig () { #{{{
 } # }}}
 
 sub checkconfig () { #{{{


@@ -61,8 +61,12 @@ sub checkconfig () { #{{{
        }
 } #}}}
 
        }
 } #}}}
 

-sub IkiWiki::displaytime ($) { #{{{
+sub IkiWiki::displaytime ($;$) { #{{{

        my $time=shift;
        my $time=shift;

+       my $format=shift;
+       if (! defined $format) {
+               $format=$config{prettydateformat};
+       }

        
        eval q{use Date::Format};
        error($@) if $@;
        
        eval q{use Date::Format};
        error($@) if $@;


@@ -93,7 +97,6 @@ sub IkiWiki::displaytime ($) { #{{{
 
        $t=~s{\%A-}{my @yest=@t; $yest[6]--; strftime("%A", \@yest)}eg;
 
 
        $t=~s{\%A-}{my @yest=@t; $yest[6]--; strftime("%A", \@yest)}eg;
 

-       my $format=$config{prettydateformat};

        $format=~s/\%X/$t/g;
        return strftime($format, \@t);
 } #}}}
        $format=~s/\%X/$t/g;
        return strftime($format, \@t);
 } #}}}