From 2d3dc86d07a7ebf5f638084259ae2d9c2c63e6b6 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Mon, 28 Jan 2008 23:48:27 -0500
Subject: [PATCH]   * prettydate,ddate: Don't ignore time formats passed to
 displaytime     function.

---
 IkiWiki/Plugin/ddate.pm      | 6 +++++-
 IkiWiki/Plugin/prettydate.pm | 5 ++++-
 debian/changelog             | 2 ++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/ddate.pm b/IkiWiki/Plugin/ddate.pm
index 6b67f4202..d081cb509 100644
--- a/IkiWiki/Plugin/ddate.pm
+++ b/IkiWiki/Plugin/ddate.pm
@@ -18,6 +18,10 @@ sub checkconfig () { #{{{
 
 sub IkiWiki::displaytime ($;$) { #{{{
 	my $time=shift;
+	my $format=shift;
+	if (! defined $format) {
+		$format=$config{timeformat};
+	}
 	eval q{
 		use DateTime;
 		use DateTime::Calendar::Discordian;
@@ -27,7 +31,7 @@ sub IkiWiki::displaytime ($;$) { #{{{
 	}
 	my $dt = DateTime->from_epoch(epoch => $time);
 	my $dd = DateTime::Calendar::Discordian->from_object(object => $dt);
-	return $dd->strftime($IkiWiki::config{timeformat});
+	return $dd->strftime($format);
 } #}}}
 
 5
diff --git a/IkiWiki/Plugin/prettydate.pm b/IkiWiki/Plugin/prettydate.pm
index b6110e427..745e6a1de 100644
--- a/IkiWiki/Plugin/prettydate.pm
+++ b/IkiWiki/Plugin/prettydate.pm
@@ -63,6 +63,10 @@ sub checkconfig () { #{{{
 
 sub IkiWiki::displaytime ($;$) { #{{{
 	my $time=shift;
+	my $format=shift;
+	if (! defined $format) {
+		$format=$config{prettydateformat};
+	}
 	
 	eval q{use Date::Format};
 	error($@) if $@;
@@ -93,7 +97,6 @@ sub IkiWiki::displaytime ($;$) { #{{{
 
 	$t=~s{\%A-}{my @yest=@t; $yest[6]--; strftime("%A", \@yest)}eg;
 
-	my $format=$config{prettydateformat};
 	$format=~s/\%X/$t/g;
 	return strftime($format, \@t);
 } #}}}
diff --git a/debian/changelog b/debian/changelog
index 6af99590d..b098bf966 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,8 @@ ikiwiki (2.21) UNRELEASED; urgency=low
   * inline: The template can check for FIRST and LAST, which will be
     set for the first and last inlined page. Useful for templates that build
     tables and the like.
+  * prettydate,ddate: Don't ignore time formats passed to displaytime
+    function.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 11 Jan 2008 15:09:37 -0500
 
-- 
2.39.5