[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5RC1-19187-g5e83631

[Marc Delisle]

The branch, master has been updated
       via  5e83631469f286abb77c95adf5284923a3a0873a (commit)
       via  6ac29b4791f8c31dd057d4ed981f26599a2cf4a3 (commit)
      from  8373e5feec2232e6a17b342eb0bf74930431bfcc (commit)


- Log -----------------------------------------------------------------
commit 5e83631469f286abb77c95adf5284923a3a0873a
Merge: 8373e5f 6ac29b4
Author: Marc Delisle <marc at infomarc.info>
Date:   Sun Sep 18 08:26:47 2011 -0400

    Fix merge conflicts

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                        |    1 +
 js/sql.js                        |   10 ++++++++--
 libraries/sql_query_form.lib.php |    4 ++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b0d3206..e8986d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -56,6 +56,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 99fd93c..d6e3bf9 100644
--- a/js/sql.js
+++ b/js/sql.js
@@ -138,10 +138,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();
 
-        var $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;
         }
diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php
index 3bdcf50..44b2321 100644
--- a/libraries/sql_query_form.lib.php
+++ b/libraries/sql_query_form.lib.php
@@ -345,7 +345,7 @@ function PMA_sqlQueryFormInsert($query = '', $is_querywindow = false, $delimiter
         .'</label>' . "\n";
 
     echo '</div>' . "\n";
-    echo '<input type="submit" name="SQL" tabindex="200" value="' . __('Go') . '" />'
+    echo '<input type="submit" id="button_submit_query" name="SQL" tabindex="200" value="' . __('Go') . '" />'
         ."\n";
     echo '<div class="clearfloat"></div>' . "\n";
     echo '</fieldset>' . "\n";
@@ -408,7 +408,7 @@ function PMA_sqlQueryFormBookmark()
     echo '</fieldset>' . "\n";
 
     echo '<fieldset id="bookmarkoptionsfooter" class="tblFooters">' . "\n";
-    echo '<input type="submit" name="SQL" value="' . __('Go') . '" />';
+    echo '<input type="submit" name="SQL" id="button_submit_bookmark" value="' . __('Go') . '" />';
     echo '<div class="clearfloat"></div>' . "\n";
     echo '</fieldset>' . "\n";
 }


hooks/post-receive
-- 
phpMyAdmin