The branch, master has been updated via 277b6a96fa8046fe9eaaec61cee50ad675766262 (commit) via dddcddbf38729f3362b2562671b510107df72b9b (commit) from bbc44c410c0ee31207821be28f57bb203749801d (commit)

- Log ----------------------------------------------------------------- commit 277b6a96fa8046fe9eaaec61cee50ad675766262 Merge: bbc44c4 dddcddb Author: Marc Delisle marc@infomarc.info Date: Sat Nov 26 06:17:16 2011 -0500

Merge branch 'QA_3_4'

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

Summary of changes: ChangeLog | 1 + libraries/check_user_privileges.lib.php | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog index b4bfec6..430c97b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -63,6 +63,7 @@ phpMyAdmin - ChangeLog

3.4.9.0 (not yet released) - bug #3442028 [edit] Inline editing enum fields with null shows no dropdown +- bug #3442004 [interface] DB suggestion not correct for user with underscore

3.4.8.0 (not yet released) - bug #3425230 [interface] enum data split at space char (more space to edit) diff --git a/libraries/check_user_privileges.lib.php b/libraries/check_user_privileges.lib.php index 1de903e..daef278 100644 --- a/libraries/check_user_privileges.lib.php +++ b/libraries/check_user_privileges.lib.php @@ -107,8 +107,11 @@ function PMA_analyseShowGrant() && substr(PMA_DBI_getError(), 1, 4) != 1044) ) { if ($GLOBALS['cfg']['SuggestDBName']) { - $GLOBALS['db_to_create'] = preg_replace('/' . $re0 . '_/', '\1?', $show_grants_dbname); - $GLOBALS['db_to_create'] = preg_replace('/' . $re0 . '%/', '\1...', $GLOBALS['db_to_create']); + /** + * Do not handle the underscore wildcard + * (this case must be rare anyway) + */ + $GLOBALS['db_to_create'] = preg_replace('/' . $re0 . '%/', '\1...', $show_grants_dbname); $GLOBALS['db_to_create'] = preg_replace('/' . $re1 . '(%|_)/', '\1\3', $GLOBALS['db_to_create']); } $GLOBALS['is_create_db_priv'] = true;

hooks/post-receive