diff options
| author | Joey Hess <joey@kodama.kitenet.net> | 2008-01-28 23:48:27 -0500 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2008-01-28 23:48:27 -0500 |
| commit | 2d3dc86d07a7ebf5f638084259ae2d9c2c63e6b6 (patch) | |
| tree | becad53508f7fe1bf5cfd76569e57ccc2a68b5e8 /IkiWiki/Plugin/prettydate.pm | |
| parent | 1b8f1b867c25c5287926ca538c1b04dbfc17f033 (diff) | |
| download | ikiwiki-2d3dc86d07a7ebf5f638084259ae2d9c2c63e6b6.tar ikiwiki-2d3dc86d07a7ebf5f638084259ae2d9c2c63e6b6.tar.gz | |
* prettydate,ddate: Don't ignore time formats passed to displaytime
function.
Diffstat (limited to 'IkiWiki/Plugin/prettydate.pm')
| -rw-r--r-- | IkiWiki/Plugin/prettydate.pm | 5 |
1 files changed, 4 insertions, 1 deletions
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); } #}}} |