From: Amitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Date: Thu, 2 Feb 2012 03:07:03 +0000 (-0500)
Subject: Merge branch 'master' into cvs
X-Git-Tag: 3.20120202~2^2~1
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/f29c12422e92a58069e0f157d6e9c3ce6e859fee?hp=fc316b9da190c3dd8b7dd28541f70d4dbf3bce91

Merge branch 'master' into cvs
---

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(@_))