From 2b53de66a06dd6449cf81f105bc6cdcf44ebac0d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Mon, 8 Sep 2008 19:40:23 -0400
Subject: ddate: Stop clobbering timeformat when not enabled.

---
 IkiWiki/Plugin/ddate.pm | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'IkiWiki/Plugin')

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;
-- 
cgit v1.2.3