The branch, master has been updated
via 3d3a5283dc334c7fb54160293acc57a984faac1b (commit)
via d3bd40b56d619f0672e323844095cc8b36e9e49e (commit)
via e27ba519c5265109d6e3ad629297d057b2c53496 (commit)
from 6f9f58080e06e795aba963ad169e438e6fae00a2 (commit)
- Log -----------------------------------------------------------------
commit 3d3a5283dc334c7fb54160293acc57a984faac1b
Merge: 6f9f580 d3bd40b
Author: Madhura Jayaratne <[email protected]>
Date: Wed Sep 14 22:50:54 2011 +0530
Merge branch 'QA_3_4'
-----------------------------------------------------------------------
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 37671bb..1ce49af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -54,6 +54,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 c695dab..738d64b 100644
--- a/js/server_privileges.js
+++ b/js/server_privileges.js
@@ -385,7 +385,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 2735de9..37ef25e 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -1875,7 +1875,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
------------------------------------------------------------------------------
BlackBerry® DevCon Americas, Oct. 18-20, San Francisco, CA
Learn about the latest advances in developing for the
BlackBerry® mobile platform with sessions, labs & more.
See new tools and technologies. Register for BlackBerry® DevCon today!
http://p.sf.net/sfu/rim-devcon-copy1
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
