Changeset 13027 for trunk/core/lib/Foswiki/Logger/PlainFile.pm

Timestamp:

11/09/11 06:35:05 (19 months ago)

Author:

PaulHarvey

Message:

Item11185: Fix wide char in print in logger code

File:

• trunk/core/lib/Foswiki/Logger/PlainFile.pm (modified) (2 diffs)

trunk/core/lib/Foswiki/Logger/PlainFile.pm

@@ -4 +4 @@
 use strict;
 use warnings;
+use utf8;
 use Assert;
 
@@ -83 +84 @@
     my $mode = '>>';
 
-    # Item10764, TODO: actually, perhaps we should open the stream this way
-    # for any encoding, not just utf8. Babar says: check what Catalyst does.
-    # TODO: 'utf8' vs 'utf-8'
-    if ( $Foswiki::cfg{Site}{CharSet} eq 'utf-8' ) {
-        $mode .= ':encoding(utf8)';
+    # Item10764, SMELL UNICODE: actually, perhaps we should open the stream this
+    # way for any encoding, not just utf8. Babar says: check what Catalyst does.
+    if ( $Foswiki::cfg{Site}{CharSet} =~ /^utf-?8$/ ) {
+        $mode .= ":encoding($Foswiki::cfg{Site}{CharSet})";
     } elsif ( utf8::is_utf8($message) ) {
         require Encode;
-        $message = Encode::encode( $Foswiki::cfg{Site}{CharSet}, $message, 0 );
+        $message = Encode::encode( $Foswiki::cfg{Site}{CharSet}, $message, 0 );
     }
     if ( open( $file, $mode, $log ) ) {