Merge branch 'master' of git://git.ikiwiki.info

master
Amitai Schlair 2012-02-01 22:02:45 -05:00
commit bd5e75fd6d
2 changed files with 1 additions and 8 deletions

View File

@ -1156,7 +1156,7 @@ sub strftime_utf8 {
# strftime doesn't know about encodings, so make sure # strftime doesn't know about encodings, so make sure
# its output is properly treated as utf8. # its output is properly treated as utf8.
# Note that this does not handle utf-8 in the format string. # 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; unless defined $strftime_encoding;
$strftime_encoding $strftime_encoding
? Encode::decode($strftime_encoding, POSIX::strftime(@_)) ? Encode::decode($strftime_encoding, POSIX::strftime(@_))

View File

@ -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.