Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin

js/server_privileges.js

@@ -212,6 +212,7 @@ $(document).ready(function() {
                 width: 800,
                 // height is a workaround for this Chrome problem:
                 // http://bugs.jqueryui.com/ticket/4671
+                // also it's interesting to be able to scroll this window
                 height: 600,
                 modal: true,
                 buttons: button_options
@@ -322,6 +323,7 @@ $(document).ready(function() {
             .append(data)
             .dialog({
                 width: 900,
+                height: 600,
                 buttons: button_options
             }); //dialog options end
             displayPasswordGenerateButton();

js/sql.js

@@ -192,12 +192,15 @@ $(document).ready(function() {
     if (! $('#sqlqueryform').find('a').is('#togglequerybox')) {
         $('<a id="togglequerybox"></a>')
         .html(PMA_messages['strHideQueryBox'])
-        .appendTo("#sqlqueryform");
+        .appendTo("#sqlqueryform")
+        // initially hidden because at this point, nothing else
+        // appears under the link
+        .hide();
 
         // Attach the toggling of the query box visibility to a click
         $("#togglequerybox").bind('click', function() {
             var $link = $(this)
-            $link.siblings().slideToggle("medium");
+            $link.siblings().slideToggle("fast");
             if ($link.text() == PMA_messages['strHideQueryBox']) {
                 $link.text(PMA_messages['strShowQueryBox']);
             } else {
@@ -263,6 +266,7 @@ $(document).ready(function() {
                 $('#sqlqueryresults').show();
                 $("#sqlqueryresults").html(data);
                 $("#sqlqueryresults").trigger('appendAnchor');
+                $('#togglequerybox').show();
                 if($("#togglequerybox").siblings(":visible").length > 0) {
                     $("#togglequerybox").trigger('click');
                 }

libraries/common.lib.php

@@ -2935,11 +2935,15 @@ function PMA_ajaxResponse($message, $success = true, $extra_data = array())
         $response = array_merge($response, $extra_data);
     }
 
-    // Set the Content-Type header to JSON so that jQuery parses the response correctly
+    // Set the Content-Type header to JSON so that jQuery parses the 
-    if(!isset($GLOBALS['is_header_sent'])) {
+    // response correctly.
-        header('Cache-Control: no-cache');
+    //
-        header("Content-Type: application/json");
+    // At this point, other headers might have been sent;
-    }
+    // even if $GLOBALS['is_header_sent'] is true,
+    // we have to send these additional headers.
+    header('Cache-Control: no-cache');
+    header("Content-Type: application/json");
+
     echo json_encode($response);
     exit;
 }

libraries/header.inc.php

@@ -15,7 +15,7 @@ require_once './libraries/common.inc.php';
 
 
 /**
- * If this is an Ajax request, we do not need to generate all this output.
+ * This is not an Ajax request so we need to generate all this output.
  */
 if (isset($GLOBALS['is_ajax_request']) && !$GLOBALS['is_ajax_request']) {