Item13378: global flag Foswiki::UNICODE to indicate unicodeness of th…

…e core
foswiki · May 9, 2015 · c545e38 · c545e38
1 parent 3529a20
commit c545e38
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/JsonRpcContrib/lib/Foswiki/Contrib/JsonRpcContrib/Request.pm b/JsonRpcContrib/lib/Foswiki/Contrib/JsonRpcContrib/Request.pm
@@ -202,8 +202,7 @@ sub toSiteCharSet {
     return $string unless $string;
 
     # Convert to unicode if the core supports it
-    return Encode::decode_utf8($string)
-      if $Foswiki::USE_UNICODE;
+    return Encode::decode_utf8($string) if $Foswiki::UNICODE;
 
     return $string
       if ( $Foswiki::cfg{Site}{CharSet} =~ /^utf-?8/i );

diff --git a/NatEditPlugin/lib/Foswiki/Plugins/NatEditPlugin/RestSave.pm b/NatEditPlugin/lib/Foswiki/Plugins/NatEditPlugin/RestSave.pm
@@ -119,8 +119,7 @@ sub toSiteCharSet {
     return $string unless $string;
 
     # Convert to unicode if the core supports it
-    return Encode::decode_utf8($string)
-      if $Foswiki::USE_UNICODE;
+    return Encode::decode_utf8($string) if $Foswiki::UNICODE;
 
     return $string
       if ( $Foswiki::cfg{Site}{CharSet} =~ /^utf-?8/i );

diff --git a/WysiwygPlugin/lib/Foswiki/Plugins/WysiwygPlugin/HTML2TML/WC.pm b/WysiwygPlugin/lib/Foswiki/Plugins/WysiwygPlugin/HTML2TML/WC.pm
@@ -389,6 +389,7 @@ our $encoded_nbsp;
 # Given a unicode string, decode all entities in it that can be mapped
 # to the current site encoding
 sub decodeRepresentableEntities {
+    my $str = shift;
 
     # Expand entities
     HTML::Entities::decode_entities($str);

diff --git a/WysiwygPlugin/lib/Foswiki/Plugins/WysiwygPlugin/Handlers.pm b/WysiwygPlugin/lib/Foswiki/Plugins/WysiwygPlugin/Handlers.pm
@@ -26,11 +26,10 @@ our $SECRET_ID =
 sub toSiteCharSet {
     my $string = shift;
 
-    return $string unless $string;
+    return $string unless defined $string;
 
     # Convert to unicode if the core supports it
-    return Encode::decode_utf8($string)
-      if $Foswiki::USE_UNICODE;
+    return Encode::decode_utf8($string) if $Foswiki::UNICODE;
 
     return $string
       if ( $Foswiki::cfg{Site}{CharSet} =~ /^utf-?8/i );
@@ -54,9 +53,10 @@ sub _OWEBTAG {
 
     return $web unless $query;
 
-    if ( defined( $query->param('templatetopic') ) ) {
+    my $tt = $query->param('templatetopic');
+    if ( defined($tt) ) {
         my @split =
-          split( /\./, toSiteCharSet( $query->param('templatetopic') ) );
+          split( /\./, toSiteCharSet($tt) );
 
         if ( $#split == 0 ) {
             return $web;
@@ -76,9 +76,10 @@ sub _OTOPICTAG {
 
     return $topic unless $query;
 
-    if ( defined( $query->param('templatetopic') ) ) {
+    my $tt = $query->param('templatetopic');
+    if ( defined($tt) ) {
         my @split =
-          split( /\./, toSiteCharSet( $query->param('templatetopic') ) );
+          split( /\./, toSiteCharSet($tt) );
 
         return $split[$#split];
     }
@@ -668,6 +669,7 @@ sub REST_TML2HTML {
     my ( $session, $plugin, $verb, $response ) = @_;
 
     my $tml = Foswiki::Func::getCgiQuery()->param('text');
+    $tml = toSiteCharSet($tml);
 
     return '' unless $tml;