[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_1RC1-1810-g21c3493
Madhura Jayaratne
madhuracj at users.sourceforge.net
Sun May 22 19:13:16 CEST 2011
The branch, master has been updated
via 21c3493d3c5564c3dfd5ba9e39596b25e2f6569a (commit)
via e936257d44ba2103c03986dd7253519480e46fac (commit)
from 6619e39d639bd994f5efe05e2766836cc1945145 (commit)
- Log -----------------------------------------------------------------
commit 21c3493d3c5564c3dfd5ba9e39596b25e2f6569a
Merge: 6619e39d639bd994f5efe05e2766836cc1945145 e936257d44ba2103c03986dd7253519480e46fac
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date: Sun May 22 22:41:55 2011 +0530
Merge branch 'QA_3_4'
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 1 +
js/sql.js | 7 ++++++-
libraries/sql_query_form.lib.php | 3 +--
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 6dcd985..99bc2dc 100644
--- a/ChangeLog
+++ b/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
diff --git a/js/sql.js b/js/sql.js
index 13fade0..32a5bba 100644
--- a/js/sql.js
+++ b/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);
diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php
index 9852e0a..25f67cd 100644
--- a/libraries/sql_query_form.lib.php
+++ b/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) {
hooks/post-receive
--
phpMyAdmin
More information about the Git
mailing list