diff options
| author | Amitai Schlair <schmonz-web-ikiwiki@schmonz.com> | 2012-02-01 22:07:03 -0500 |
|---|---|---|
| committer | Amitai Schlair <schmonz-web-ikiwiki@schmonz.com> | 2012-02-01 22:07:03 -0500 |
| commit | f29c12422e92a58069e0f157d6e9c3ce6e859fee (patch) | |
| tree | c9d8b992d8a6dd6e520f0f992aecb0623bcdfb71 | |
| parent | fc316b9da190c3dd8b7dd28541f70d4dbf3bce91 (diff) | |
| parent | bd5e75fd6dc7adef3dde52284282655a06a951fe (diff) | |
| download | ikiwiki-f29c12422e92a58069e0f157d6e9c3ce6e859fee.tar ikiwiki-f29c12422e92a58069e0f157d6e9c3ce6e859fee.tar.gz | |
Merge branch 'master' into cvs
| -rw-r--r-- | IkiWiki.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/IkiWiki.pm b/IkiWiki.pm index 0a788f35b..2a83777e6 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -1156,7 +1156,7 @@ sub strftime_utf8 { # strftime doesn't know about encodings, so make sure # its output is properly treated as utf8. # Note that this does not handle utf-8 in the format string. - $strftime_encoding = POSIX::setlocale(&POSIX::LC_TIME) =~ m#\.([^@]+)# + ($strftime_encoding) = POSIX::setlocale(&POSIX::LC_TIME) =~ m#\.([^@]+)# unless defined $strftime_encoding; $strftime_encoding ? Encode::decode($strftime_encoding, POSIX::strftime(@_)) |