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

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

diff --git a/IkiWiki/Plugin/ddate.pm b/IkiWiki/Plugin/ddate.pm
index 862d4da5b180146356757dff5600977a2df41966..d081cb5094d56b5030ba54f7504d911785000643 100644 (file)
--- a/IkiWiki/Plugin/ddate.pm
+++ b/IkiWiki/Plugin/ddate.pm
@@ -1,11 +1,12 @@
 #!/usr/bin/perl
 # Discordian date support fnord ikiwiki.
 package IkiWiki::Plugin::ddate;
 #!/usr/bin/perl
 # Discordian date support fnord ikiwiki.
 package IkiWiki::Plugin::ddate;

-use IkiWiki;
+
+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 () { #{{{


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

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

        my $time=shift;
        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;


@@ -26,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