Merge branch 'master' into pedigree

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

diff --git a/IkiWiki/Plugin/ddate.pm b/IkiWiki/Plugin/ddate.pm
index 7382d4160cd84fe62f21daa366135dcabfde19f7..d081cb5094d56b5030ba54f7504d911785000643 100644 (file)
--- a/IkiWiki/Plugin/ddate.pm
+++ b/IkiWiki/Plugin/ddate.pm
@@ -6,7 +6,7 @@ use IkiWiki 2.00;
 no warnings;
 
 sub import { #{{{
 no warnings;
 
 sub import { #{{{

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

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


@@ -18,6 +18,10 @@ sub checkconfig () { #{{{
 
 sub IkiWiki::displaytime ($;$) { #{{{
        my $time=shift;
 
 sub IkiWiki::displaytime ($;$) { #{{{
        my $time=shift;

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

        eval q{
                use DateTime;
                use DateTime::Calendar::Discordian;
        eval q{
                use DateTime;
                use DateTime::Calendar::Discordian;


@@ -27,7 +31,7 @@ sub IkiWiki::displaytime ($;$) { #{{{
        }
        my $dt = DateTime->from_epoch(epoch => $time);
        my $dd = DateTime::Calendar::Discordian->from_object(object => $dt);
        }
        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
 } #}}}
 
 5