[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_7_1-46-gdddcddb

[Marc Delisle]

The branch, QA_3_4 has been updated
       via  dddcddbf38729f3362b2562671b510107df72b9b (commit)
      from  9c278d020cde6ee32e830b2d0d7f11de8b59e68e (commit)


- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

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 5133a9b..343d6da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,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 6dbc251..291213c 100644
--- a/libraries/check_user_privileges.lib.php
+++ b/libraries/check_user_privileges.lib.php
@@ -128,8 +128,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
-- 
phpMyAdmin