Changeset 3147

Timestamp:

10/29/08 09:58:40 (17 months ago)

Author:

fumiakiy

Message:

Updated WXRHandler to follow the changes regarding UTF-8 string made to XML::SAX::PurePerl that was updated at r3146. BugId:82361

Files:

• branches/frampton/plugins/WXRImporter/lib/WXRImporter/WXRHandler.pm (modified) (4 diffs)

branches/frampton/plugins/WXRImporter/lib/WXRImporter/WXRHandler.pm

@@ -32 +32 @@
 
     1;
+}
+
+sub _encoder {
+    my ( $text ) = @_;
+    $text = MT::I18N::encode_text($text, 'utf-8');
+    if ( MT->config->PublishCharset =~ /utf-?8/i ) {
+        $text = MT::I18N::utf8_off($text);
+    }
+    return $text;
 }
 
@@ -65 +74 @@
 
     my %values = map { $attrs->{$_}->{LocalName} => 
-            MT::I18N::encode_text(MT::I18N::utf8_off($attrs->{$_}->{Value}), 'utf-8')
+            _encoder($attrs->{$_}->{Value})
         } keys(%$attrs);
 
@@ -90 +99 @@
     return unless $element;
 
-    my $chars = MT::I18N::utf8_off($data->{Data});
+    my $chars = $data->{Data};
     if ('HASH' eq ref($element)) {
         my @hash_array = grep { $_ ne '_a' } keys %$element;
@@ -121 +130 @@
     if ('HASH' eq ref($element)) {
         $element->{$prefix . '_' . $name} = 
-            MT::I18N::encode_text($element->{$prefix . '_' . $name}, 'utf-8')
+            _encoder($element->{$prefix . '_' . $name})
                 if exists $element->{$prefix . '_' . $name};
     }