X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/903213e63fd6c409046f66e73881aba33c3926de..46c2d66fd37b12c2d02466118cb206000174f1b4:/IkiWiki/Plugin/ddate.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/ddate.pm b/IkiWiki/Plugin/ddate.pm
index 2ec122833..bb77ce59f 100644
--- a/IkiWiki/Plugin/ddate.pm
+++ b/IkiWiki/Plugin/ddate.pm
@@ -2,34 +2,29 @@
 # Discordian date support fnord ikiwiki.
 package IkiWiki::Plugin::ddate;
 
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 no warnings;
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "ddate", call => \&getsetup);
-	hook(type => "checkconfig", id => "ddate", call => \&checkconfig);
-} # }}}
+}
 
-sub getsetup { #{{{
+sub getsetup {
 	return
 		plugin => {
 			safe => 1,
 			rebuild => 1,
 		},
-} #}}}
+}
 
-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};
+		if ($format eq '%c') {
+			$format='on %A, the %e of %B, %Y. %N%nCelebrate %H';
+		}
 	}
 	eval q{
 		use DateTime;
@@ -41,6 +36,6 @@ sub IkiWiki::displaytime ($;$) { #{{{
 	my $dt = DateTime->from_epoch(epoch => $time);
 	my $dd = DateTime::Calendar::Discordian->from_object(object => $dt);
 	return $dd->strftime($format);
-} #}}}
+}
 
 5