diff --git a/ChangeLog b/ChangeLog index 328732342..61cfbc43a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ phpMyAdmin - ChangeLog - bug #3399951 [export] Config for export compression not used - bug #3400690 [privileges] DB-specific privileges won't submit - bug #3410604 [config] Configuration storage incorrect suggested table name +- bug #3383572 [interface] Cannot execute saved query 3.4.5.0 (2011-09-14) - bug #3375325 [interface] Page list in navigation frame looks odd diff --git a/js/sql.js b/js/sql.js index 842b6c6b9..34ab158ae 100644 --- a/js/sql.js +++ b/js/sql.js @@ -261,10 +261,16 @@ $(document).ready(function() { * @memberOf jQuery * @name sqlqueryform_submit */ - $("#sqlqueryform.ajax").live('submit', function(event) { + $("#sqlqueryform.ajax input:submit").live('click', function(event) { event.preventDefault(); - $form = $(this); + var $form = $(this).closest("form"); + var clicked_button = $(this).attr('id'); + + if ('button_submit_query' == clicked_button) { + $form.find("select[name=id_bookmark]").attr("value",""); + } + if (! checkSqlQuery($form[0])) { return false; } @@ -276,7 +282,7 @@ $(document).ready(function() { PMA_prepareForAjaxRequest($form); - $.post($(this).attr('action'), $(this).serialize() , function(data) { + $.post($form.attr('action'), $form.serialize() , function(data) { if(data.success == true) { // fade out previous messages, if any $('.success').fadeOut(); diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php index 25f67cdbb..74cae9ff2 100644 --- a/libraries/sql_query_form.lib.php +++ b/libraries/sql_query_form.lib.php @@ -381,7 +381,7 @@ function PMA_sqlQueryFormInsert($query = '', $is_querywindow = false, $delimiter .'' . "\n"; echo '' . "\n"; - echo '' + echo '' ."\n"; echo '
' . "\n"; echo '' . "\n"; @@ -451,7 +451,7 @@ function PMA_sqlQueryFormBookmark() echo '' . "\n"; echo '' . "\n"; }