Merge remote-tracking branch 'origin/QA_4_0'

Conflicts: server_variables.php
phpmyadmin · Aug 7, 2013 · 04ed28c · 04ed28c
2 parents e4ee7fc + 01ebe9c
commit 04ed28c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/libraries/server_variables.lib.php b/libraries/server_variables.lib.php
@@ -149,7 +149,7 @@ function PMA_formatVariable($name, $value, $variable_doc_links)
  */
 function PMA_getHtmlForLinkTemplates()
 {
-    $url = htmlspecialchars('server_variables.php?' . PMA_URL_getCommon());
+    $url = htmlspecialchars('server_variables.php' . PMA_URL_getCommon(array()));
     $output  = '<a style="display: none;" href="#" class="editLink">';
     $output .= PMA_Util::getIcon('b_edit.png', __('Edit')) . '</a>';
     $output .= '<a style="display: none;" href="'