From: Joey Hess <joey@kodama.kitenet.net>
Date: Mon, 8 Sep 2008 23:40:23 +0000 (-0400)
Subject: ddate: Stop clobbering timeformat when not enabled.
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/2b53de66a06dd6449cf81f105bc6cdcf44ebac0d?hp=0e654c1ea0b7009f497a7fc6f44263ee79860dd8

ddate: Stop clobbering timeformat when not enabled.
---

diff --git a/IkiWiki/Plugin/ddate.pm b/IkiWiki/Plugin/ddate.pm
index 2ec122833..6c36de0a6 100644
--- 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);
-	hook(type => "checkconfig", id => "ddate", call => \&checkconfig);
 } # }}}
 
 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};
+		if ($format eq '%c') {
+			$format='on %A, the %e of %B, %Y. %N%nCelebrate %H';
+		}
 	}
 	eval q{
 		use DateTime;
diff --git a/debian/changelog b/debian/changelog
index 02017174c..6ef68a7f6 100644
--- 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.
+  * ddate: Stop clobbering timeformat when not enabled.
 
  -- 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 70ab7bb9d..b195f48ee 100644
--- 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)
+
+[[done fnord|done]]