move plugin toggles to before config setting again

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

diff --git a/IkiWiki/Plugin/ddate.pm b/IkiWiki/Plugin/ddate.pm
index 6b67f420232adcc835800c5b4729a47a5a7eb1a6..2ec1228333c591baeb0288cd80f9972efc15b52d 100644 (file)
--- a/IkiWiki/Plugin/ddate.pm
+++ b/IkiWiki/Plugin/ddate.pm
@@ -6,9 +6,18 @@ use IkiWiki 2.00;
 no warnings;
 
 sub import { #{{{
+       hook(type => "getsetup", id => "ddate", call => \&getsetup);
        hook(type => "checkconfig", id => "ddate", call => \&checkconfig);
 } # }}}
 
+sub getsetup { #{{{
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => 1,
+               },
+} #}}}
+
 sub checkconfig () { #{{{
        if (! defined $config{timeformat} ||
            $config{timeformat} eq '%c') {
@@ -18,6 +27,10 @@ sub checkconfig () { #{{{
 
 sub IkiWiki::displaytime ($;$) { #{{{
        my $time=shift;
+       my $format=shift;
+       if (! defined $format) {
+               $format=$config{timeformat};
+       }
        eval q{
                use DateTime;
                use DateTime::Calendar::Discordian;
@@ -27,7 +40,7 @@ sub IkiWiki::displaytime ($;$) { #{{{
        }
        my $dt = DateTime->from_epoch(epoch => $time);
        my $dd = DateTime::Calendar::Discordian->from_object(object => $dt);
-       return $dd->strftime($IkiWiki::config{timeformat});
+       return $dd->strftime($format);
 } #}}}
 
 5