summaryrefslogtreecommitdiff
path: root/IkiWiki.pm
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2007-11-13 16:14:48 -0500
committerJoey Hess <joey@kodama.kitenet.net>2007-11-13 16:14:48 -0500
commit264a82a435b9ce5560f4bbea7b53270c53ef5720 (patch)
tree3f48689d2bed7cfbd9e198ecf10a1c7788f70ed1 /IkiWiki.pm
parent426d94b5007b3792a72ba4394e41b12e874d8203 (diff)
* inline: Add timeformat parameter to control how the ctime of
inlined pages is displayed. Closes: #451019
Diffstat (limited to 'IkiWiki.pm')
-rw-r--r--IkiWiki.pm9
1 files changed, 6 insertions, 3 deletions
diff --git a/IkiWiki.pm b/IkiWiki.pm
index 5ae360ad0..ad4d26741 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -498,13 +498,16 @@ sub abs2rel ($$) { #{{{
return $ret;
} #}}}
-sub displaytime ($) { #{{{
+sub displaytime ($;$) { #{{{
my $time=shift;
+ my $format=shift;
+ if (! defined $format) {
+ $format=$config{timeformat};
+ }
# strftime doesn't know about encodings, so make sure
# its output is properly treated as utf8
- return decode_utf8(POSIX::strftime(
- $config{timeformat}, localtime($time)));
+ return decode_utf8(POSIX::strftime($format, localtime($time)));
} #}}}
sub beautify_url ($) { #{{{