Avoid double escaping of built in transformation URLs

We do already escape them in the tranformation, so avoid doing that before. Issue #12483 Signed-off-by: Michal Čihař <michal@cihar.com>
phpmyadmin · Aug 24, 2016 · cbd6137 · cbd6137
1 parent ed6188d
commit cbd6137
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/libraries/DisplayResults.php b/libraries/DisplayResults.php
@@ -3277,7 +3277,7 @@ private function _getSpecialLinkUrl($column_value, $row_info, $field_name)
         $divider = strpos($link_relations['default_page'], '?') ? '&' : '?';
         if (empty($link_relations['link_dependancy_params'])) {
             return $link_relations['default_page']
-                . PMA_URL_getCommon($linking_url_params, 'html', $divider);
+                . PMA_URL_getCommon($linking_url_params, 'raw', $divider);
         }
 
         foreach ($link_relations['link_dependancy_params'] as $new_param) {
@@ -3301,7 +3301,7 @@ private function _getSpecialLinkUrl($column_value, $row_info, $field_name)
         }
 
         return $link_relations['default_page']
-            . PMA_URL_getCommon($linking_url_params, 'html', $divider);
+            . PMA_URL_getCommon($linking_url_params, 'raw', $divider);
     }
 
 

diff --git a/test/classes/DisplayResultsTest.php b/test/classes/DisplayResultsTest.php
@@ -979,10 +979,10 @@ public function dataProviderForTestGetSpecialLinkUrl()
                     'routine_type' => 'FUNCTION'
                 ),
                 'routine_name',
-                'db_routines.php?item_name=circumference&amp;db=data'
-                . '&amp;item_type=FUNCTION&amp;server=0&amp;lang=en'
-                . '&amp;collation_connection=utf-8'
-                . '&amp;token=token'
+                'db_routines.php?item_name=circumference&db=data'
+                . '&item_type=FUNCTION&server=0&lang=en'
+                . '&collation_connection=utf-8'
+                . '&token=token'
             ),
             array(
                 'information_schema',
@@ -994,10 +994,10 @@ public function dataProviderForTestGetSpecialLinkUrl()
                     'routine_type' => 'PROCEDURE'
                 ),
                 'routine_name',
-                'db_routines.php?item_name=area&amp;db=data'
-                . '&amp;item_type=PROCEDURE&amp;server=0&amp;lang=en'
-                . '&amp;collation_connection=utf-8'
-                . '&amp;token=token'
+                'db_routines.php?item_name=area&db=data'
+                . '&item_type=PROCEDURE&server=0&lang=en'
+                . '&collation_connection=utf-8'
+                . '&token=token'
             ),
             array(
                 'information_schema',
@@ -1009,10 +1009,10 @@ public function dataProviderForTestGetSpecialLinkUrl()
                 ),
                 'column_name',
                 'index.php?sql_query=SELECT+%60CHARACTER_SET_NAME%60+FROM+%60info'
-                . 'rmation_schema%60.%60CHARACTER_SETS%60&amp;db=information_schema'
-                . '&amp;test_name=value&amp;server=0&amp;lang=en'
-                . '&amp;collation_connection=utf-8'
-                . '&amp;token=token'
+                . 'rmation_schema%60.%60CHARACTER_SETS%60&db=information_schema'
+                . '&test_name=value&server=0&lang=en'
+                . '&collation_connection=utf-8'
+                . '&token=token'
             )
         );
     }