Item13477: Compatibility with UTF-8 core on Foswiki 1.2

foswiki · Jun 26, 2015 · 52ea281 · 52ea281
1 parent abc4561
commit 52ea281
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/lib/Foswiki/Plugins/TopicInteractionPlugin/Attachments.pm b/lib/Foswiki/Plugins/TopicInteractionPlugin/Attachments.pm
@@ -277,6 +277,7 @@ 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,6 +197,7 @@ 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);
@@ -273,8 +274,10 @@ sub urlDecode {
 
   $value =~ s/%([\da-f]{2})/chr(hex($1))/gei;
   my $session = $Foswiki::Plugins::SESSION;
-  my $downgradedValue = $session->UTF82SiteCharSet($value);
-  $value = $downgradedValue if defined $downgradedValue;
+  unless ($Foswiki::UNICODE) {
+      my $downgradedValue = $session->UTF82SiteCharSet($value);
+      $value = $downgradedValue if defined $downgradedValue;
+  }
 
   $value =~ s/^\s+//g;
   $value =~ s/\s+$//g;
@@ -319,7 +322,7 @@ sub printJSONRPC {
   }
 
   $message = JSON::to_json($message, {pretty=>1});
-  $response->print($message);
+  $response->body($message);
 }
 
 ##############################################################################