ddate: Stop clobbering timeformat when not enabled.

diff --git a/IkiWiki/Plugin/ddate.pm b/IkiWiki/Plugin/ddate.pm
index 2ec1228333c591baeb0288cd80f9972efc15b52d..6c36de0a6b120b6047c44cca610bcd5e80333c29 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 ($;$) { #{{{
        my $time=shift;
        my $format=shift;
        if (! defined $format) {
                $format=$config{timeformat};
 sub IkiWiki::displaytime ($;$) { #{{{
        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;

diff --git a/debian/changelog b/debian/changelog
index 02017174c4792d51d1905e8df653a2abc39a0248..6ef68a7f609a725f2af409072a5d719bf4e092d5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ ikiwiki (2.64) UNRELEASED; urgency=low
 
   * Avoid uninitialised value when --dumpsetup is used and no srcdir/destdir
     specified.
 
   * Avoid uninitialised value when --dumpsetup is used and no srcdir/destdir
     specified.

+  * ddate: Stop clobbering timeformat when not enabled.

 
  -- Joey Hess <joeyh@debian.org>  Mon, 08 Sep 2008 19:21:20 -0400
 
 
  -- Joey Hess <joeyh@debian.org>  Mon, 08 Sep 2008 19:21:20 -0400
 

diff --git a/doc/bugs/ddate_plugin_causes_websetup_to_change_timeformat__44___even_when_disabled.mdwn b/doc/bugs/ddate_plugin_causes_websetup_to_change_timeformat__44___even_when_disabled.mdwn
index 70ab7bb9d036ed5fd43c504c636c5dd26ae4ed09..b195f48ee2696c4392e7b42ffb7f6b8edb242759 100644 (file)
--- a/doc/bugs/ddate_plugin_causes_websetup_to_change_timeformat__44___even_when_disabled.mdwn
+++ b/doc/bugs/ddate_plugin_causes_websetup_to_change_timeformat__44___even_when_disabled.mdwn
@@ -3,3 +3,5 @@ If the timeformat option is '%c', every time websetup rewrites the setup file, i
 Presumably this is because websetup loads all plugins, so IkiWiki::plugin::ddate::checkconfig is run...
 
 (This bug seems oddly appropriate. Hail Eris)
 Presumably this is because websetup loads all plugins, so IkiWiki::plugin::ddate::checkconfig is run...
 
 (This bug seems oddly appropriate. Hail Eris)

+
+[[done fnord|done]]