Merge commit 'upstream/master'

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

diff --git a/IkiWiki/Plugin/ddate.pm b/IkiWiki/Plugin/ddate.pm
index 2ec1228333c591baeb0288cd80f9972efc15b52d..c73317b2f81cbb46abb48b2a55357e8d77adb625 100644 (file)
--- a/IkiWiki/Plugin/ddate.pm
+++ b/IkiWiki/Plugin/ddate.pm
@@ -7,7 +7,6 @@ no warnings;
 
 sub import { #{{{
        hook(type => "getsetup", id => "ddate", call => \&getsetup);
 
 sub import { #{{{
        hook(type => "getsetup", id => "ddate", call => \&getsetup);

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

 } # }}}
 
 sub getsetup { #{{{
 } # }}}
 
 sub getsetup { #{{{


@@ -18,18 +17,14 @@ sub getsetup { #{{{
                },
 } #}}}
 
                },
 } #}}}
 

-sub checkconfig () { #{{{
-       if (! defined $config{timeformat} ||
-           $config{timeformat} eq '%c') {
-               $config{timeformat}='on %A, the %e of %B, %Y. %N%nCelebrate %H';
-       }
-} #}}}
-
-sub IkiWiki::displaytime ($;$) { #{{{
+sub IkiWiki::formattime ($;$) { #{{{

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

+               if ($format eq '%c') {
+                       $format='on %A, the %e of %B, %Y. %N%nCelebrate %H';
+               }

        }
        eval q{
                use DateTime;
        }
        eval q{
                use DateTime;