Merge remote-tracking branch 'origin/master'

ChangeLog

@@ -15,6 +15,7 @@
 - patch #3303813 [setup] Define a label that was missing
 - bug #3305606 [interface] Show all button wraps on privileges page
 - bug #3305517 [config] Config for export compression not used
+- bug #3305883 [interface] Table is dropped regardless of confirmation
 
 3.4.1.0 (2011-05-20)
 - bug #3301108 [interface] Synchronize and already configured host

js/sql.js

@@ -263,10 +263,15 @@ $(document).ready(function() {
      */
     $("#sqlqueryform.ajax").live('submit', function(event) {
         event.preventDefault();
+
+        $form = $(this);
+        if (! checkSqlQuery($form[0])) {
+            return false;
+        }
+
         // remove any div containing a previous error message
         $('.error').remove();
 
-        $form = $(this);
         var $msgbox = PMA_ajaxShowMessage();
 
         PMA_prepareForAjaxRequest($form);

libraries/sql_query_form.lib.php

@@ -119,8 +119,7 @@ function PMA_sqlQueryForm($query = true, $display_tab = false, $delimiter = ';')
         if ($GLOBALS['cfg']['AjaxEnable']) {
             echo ' class="ajax"';
         }
-        echo ' id="sqlqueryform"'
-            .' onsubmit="return checkSqlQuery(this)" name="sqlform">' . "\n";
+        echo ' id="sqlqueryform" name="sqlform">' . "\n";
     }
 
     if ($is_querywindow) {