diff options
| author | Amitai Schlair <schmonz-web-ikiwiki@schmonz.com> | 2012-02-01 22:02:45 -0500 |
|---|---|---|
| committer | Amitai Schlair <schmonz-web-ikiwiki@schmonz.com> | 2012-02-01 22:02:45 -0500 |
| commit | bd5e75fd6dc7adef3dde52284282655a06a951fe (patch) | |
| tree | 5140c571908caf4c1f4bfa58a6103ac7cf4a1360 | |
| parent | 3e3cb82154d3b984b502ea697e101528cc9bb41e (diff) | |
| parent | 3200515b3d447eea032f96ebff17d9bfa8ea255b (diff) | |
| download | ikiwiki-bd5e75fd6dc7adef3dde52284282655a06a951fe.tar ikiwiki-bd5e75fd6dc7adef3dde52284282655a06a951fe.tar.gz | |
Merge branch 'master' of git://git.ikiwiki.info
| -rw-r--r-- | IkiWiki.pm | 2 | ||||
| -rw-r--r-- | doc/examples/blog/posts/Test_Post.mdwn | 7 |
2 files changed, 1 insertions, 8 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(@_)) diff --git a/doc/examples/blog/posts/Test_Post.mdwn b/doc/examples/blog/posts/Test_Post.mdwn deleted file mode 100644 index e416c235f..000000000 --- a/doc/examples/blog/posts/Test_Post.mdwn +++ /dev/null @@ -1,7 +0,0 @@ -## Test Post - -This is a quick test of *ikiwiki*. The quick brown dog jumps over the lazy dog and now is the time for all good men to come to the aid of the party. - -### Some More Stuff - -And here is a new paragraph. |