gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'QA_3_4'

Browse Source
This commit is contained in:
Madhura Jayaratne 2011-09-14 22:50:54 +05:30
commit 3d3a5283dc
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -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

2
js/server_privileges.js
View File

@ -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();

2
server_privileges.php
View File

@ -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"