Item13478: And encoding url early breaks TablePlugin

foswiki · Jun 29, 2015 · 48bcacb · 48bcacb
1 parent 9e23f52
commit 48bcacb
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/TablePlugin/lib/Foswiki/Plugins/TablePlugin/Core.pm b/TablePlugin/lib/Foswiki/Plugins/TablePlugin/Core.pm
@@ -1894,8 +1894,11 @@ sub handler {
         $cgi->delete( 'sortcol', 'table', 'up' );
         $url = $cgi->url( -absolute => 1, -path => 1 ) . '?';
         my $queryString = $cgi->query_string();
-        $url .= $queryString . ';' if $queryString;
-        $url = Foswiki::decode_utf8($url) if $Foswiki::UNICODE;
+        if ($queryString) {
+            $queryString = Foswiki::decode_utf8($queryString)
+              if $Foswiki::UNICODE;
+            $url .= $queryString . ';';
+        }
 
         # Restore parameters, so we don't interfere on the remaining execution
         $cgi->param( -name => 'sortcol', -value => \@origSort )  if @origSort;