Revert "Item13477: Compatibility with UTF-8 core on Foswiki 1.2"

This reverts commit 52ea281. The problem is in the javascript code that url encodes post data.
foswiki · Jun 28, 2015 · aec7ecb · aec7ecb
1 parent 52ea281
commit aec7ecb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/lib/Foswiki/Plugins/TopicInteractionPlugin/Attachments.pm b/lib/Foswiki/Plugins/TopicInteractionPlugin/Attachments.pm
@@ -277,7 +277,6 @@ sub urlEncode {
   my ($infoOrText, $property) = @_;
 
   my $text = defined($property)?$infoOrText->{$property}:$infoOrText;
-  $text = Foswiki::encode_utf8($text) if ( $Foswiki::UNICODE );
   $text =~ s/([^0-9a-zA-Z-_.:~!*\/])/'%'.sprintf('%02X',ord($1))/ge;
 
   return $text;

diff --git a/lib/Foswiki/Plugins/TopicInteractionPlugin/Core.pm b/lib/Foswiki/Plugins/TopicInteractionPlugin/Core.pm
@@ -197,7 +197,6 @@ sub prepareAction {
 
   # read parameters 
   my $topic = $params->{topic} || $session->{webTopic};
-  $topic = Foswiki::decode_utf8($topic) if ( $Foswiki::UNICODE );
   my $web = $session->{webName};
 
   ($web, $topic) = Foswiki::Func::normalizeWebTopicName($web, $topic);
@@ -274,10 +273,8 @@ sub urlDecode {
 
   $value =~ s/%([\da-f]{2})/chr(hex($1))/gei;
   my $session = $Foswiki::Plugins::SESSION;
-  unless ($Foswiki::UNICODE) {
-      my $downgradedValue = $session->UTF82SiteCharSet($value);
-      $value = $downgradedValue if defined $downgradedValue;
-  }
+  my $downgradedValue = $session->UTF82SiteCharSet($value);
+  $value = $downgradedValue if defined $downgradedValue;
 
   $value =~ s/^\s+//g;
   $value =~ s/\s+$//g;
@@ -322,7 +319,7 @@ sub printJSONRPC {
   }
 
   $message = JSON::to_json($message, {pretty=>1});
-  $response->body($message);
+  $response->print($message);
 }
 
 ##############################################################################