Item13881: Fix unicode column headings

The Request->url() method returns the path and query string components as url encoded byte strings. Need to call Foswiki::decodeUrl to recover the character string. Conflicts: TablePlugin/lib/Foswiki/Plugins/TablePlugin/Core.pm
foswiki · Dec 30, 2015 · 1298518 · 1298518
1 parent cb452f8
commit 1298518
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/TablePlugin/lib/Foswiki/Plugins/TablePlugin/Core.pm b/TablePlugin/lib/Foswiki/Plugins/TablePlugin/Core.pm
@@ -1897,11 +1897,10 @@ sub handler {
         @origTable = $cgi->multi_param('table');
         @origUp    = $cgi->multi_param('up');        # NOTE: internal parameter
         $cgi->delete( 'sortcol', 'table', 'up' );
-        $url = NFC(
-            Foswiki::decode_utf8(
-                $cgi->url( -absolute => 1, -path => 1 ) . '?'
-            )
-        );
+        $url =
+          NFC(
+            Foswiki::urlDecode( $cgi->url( -absolute => 1, -path => 1 ) . '?' )
+          );
         my $queryString = $cgi->query_string();
 
         if ($queryString) {

diff --git a/core/lib/Foswiki/Request.pm b/core/lib/Foswiki/Request.pm
@@ -256,6 +256,9 @@ Returns many url info.
    * -path => 1, -query => 1 also includes path info and query string
      respectively
 
+Note that the path and query components are returned as a *URL encoded byte string*
+You will most likely need to Foswiki::urlDecode it for use.
+
 Reasonably compatible with CGI corresponding method. Doesn't support
 -rewrite. See Item5914.