[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_5RC1-11-gd3bd40b

[Madhura Jayaratne]

The branch, QA_3_4 has been updated
       via  d3bd40b56d619f0672e323844095cc8b36e9e49e (commit)
      from  e27ba519c5265109d6e3ad629297d057b2c53496 (commit)


- Log -----------------------------------------------------------------
commit d3bd40b56d619f0672e323844095cc8b36e9e49e
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date:   Wed Sep 14 22:43:48 2011 +0530

    bug #3400690 [privileges] DB-specific privileges won't submit
    Db/table specific privileges has not been ajaxified. So skip it for now.

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

Summary of changes:
 ChangeLog               |    1 +
 js/server_privileges.js |    2 +-
 server_privileges.php   |    2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d05c29a..83aa38d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@ phpMyAdmin - ChangeLog
 - bug #3404886 [navi] Edit SQL statement after error
 - bug #3403165 [interface] Collation not displayed for long enum fields
 - bug #3399951 [export] Config for export compression not used
+- bug #3400690 [privileges] DB-specific privileges won't submit
 
 3.4.5.0 (2011-09-14)
 - bug #3375325 [interface] Page list in navigation frame looks odd
diff --git a/js/server_privileges.js b/js/server_privileges.js
index f178c6c..fe0f69f 100644
--- a/js/server_privileges.js
+++ b/js/server_privileges.js
@@ -346,7 +346,7 @@ $(document).ready(function() {
      * @memberOf    jQuery
      * @name        edit_user_submit
      */
-    $("#edit_user_dialog").find("form").live('submit', function(event) {
+    $("#edit_user_dialog").find("form:not(#db_or_table_specific_priv)").live('submit', function(event) {
         /** @lends jQuery */
         event.preventDefault();
 
diff --git a/server_privileges.php b/server_privileges.php
index 81de01f..12fb1db 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -1790,7 +1790,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
             // but only if $dbname contains no wildcards
 
             // table header
-            echo '<form action="server_privileges.php" method="post">' . "\n"
+            echo '<form action="server_privileges.php" id="db_or_table_specific_priv" method="post">' . "\n"
                . PMA_generate_common_hidden_inputs('', '')
                . '<input type="hidden" name="username" value="' . htmlspecialchars($username) . '" />' . "\n"
                . '<input type="hidden" name="hostname" value="' . htmlspecialchars($hostname) . '" />' . "\n"


hooks/post-receive
-- 
phpMyAdmin