Changeset 3617

Timestamp:

04/10/09 09:13:44 (12 months ago)

Author:

fumiakiy

Message:

Removed calls to encode_text from various places.

Location:

branches/feature-utf8-strings/lib

Files:

• MT.pm (modified) (3 diffs)
• MT/CMS/Common.pm (modified) (2 diffs)
• MT/CMS/Entry.pm (modified) (2 diffs)
• MT/CMS/Tools.pm (modified) (3 diffs)

branches/feature-utf8-strings/lib/MT.pm

@@ -12 +12 @@
 use File::Basename;
 use MT::Util qw( weaken );
-use MT::I18N qw( encode_text );
+use MT::I18N;
 
 our ( $VERSION,      $SCHEMA_VERSION );
@@ -1722 +1722 @@
               . ( $res->{good}
                 ? ''
-                : ' ' . MT::I18N::encode_text( $res->{error} ) );
+                : ' ' . $res->{error} );
         }
         $entry->pinged_urls( join "\n", @$pinged );
@@ -2238 +2238 @@
         my $q = $mt->{query};
         if ($mode) {
-            my @query = map { { name => $_, value => scalar encode_text( $q->param($_) ) }; }
+            my @query = map { { name => $_, value => $q->param($_) }; }
                 grep { ($_ ne 'username') && ($_ ne 'password') && ($_ ne 'submit') && ($mode eq 'logout' ? ($_ ne '__mode') : 1) } $q->param;
             $param->{query_params} = \@query;

branches/feature-utf8-strings/lib/MT/CMS/Common.pm

@@ -444 +444 @@
     $app->remove_preview_file;
 
-    my $enc = $app->config->PublishCharset;
     if ( $q->param('_recover') ) {
         my $sess_obj = $app->autosave_session_obj;
@@ -464 +463 @@
         foreach (qw( title text )) {
             my $data = $q->param($_);
-            my $encoded = MT::I18N::encode_text( $data, undef, $enc )
-              if $data;
-            $q->param( $_, $encoded );
+            $q->param( $_, $data );
         }
     }

branches/feature-utf8-strings/lib/MT/CMS/Entry.pm

@@ -4 +4 @@
 use MT::Util qw( format_ts relative_date remove_html encode_html encode_js
     encode_url archive_file_for offset_time_list );
-use MT::I18N qw( substr_text const length_text wrap_text encode_text
+use MT::I18N qw( substr_text const length_text wrap_text
     break_up_text first_n_text guess_encoding );
 
@@ -1744 +1744 @@
                     "Ping '[_1]' failed: [_2]",
                     $res->{url},
-                    encode_text( $res->{error}, undef, undef )
+                    $res->{error}
                 ),
                 class => 'system',

branches/feature-utf8-strings/lib/MT/CMS/Tools.pm

@@ -4 +4 @@
 use Symbol;
 
-use MT::I18N qw( encode_text wrap_text );
+use MT::I18N qw( wrap_text );
 use MT::Util qw( encode_url encode_html decode_html encode_js trim );
 
@@ -72 +72 @@
             $syscheck_object = undef;
         }
-        return encode_text( $syscheck_object->data(), 'utf-8', undef )
+        return $syscheck_object->data()
           if ($syscheck_object);
 
@@ -99 +99 @@
             );
             $syscheck_object->save();
-            $result = encode_text( $result, 'utf-8', undef );
         }
         return $result;