From c350428b49255e8f521b3d28c0ef9d2e6e126199 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Tue, 6 Apr 2004 13:22:20 +0000
Subject: [PATCH] bug 922054 new fix attempt

---
 ChangeLog | 3 +++
 main.php  | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index e50ce32cf..ed3d4e932 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2004-04-06 Marc Delisle  <lem9@users.sourceforge.net>
+    * main.php, complete the fix for bug 922054
+
 2004-04-04 Marc Delisle  <lem9@users.sourceforge.net>
     * lang/polish: Updated, thanks to Jakub Wilk (ubanus).
     * lang/norwegian:  Updated, thanks to Sven-Erik Andersen (sven-erik).
diff --git a/main.php b/main.php
index 289bbbcd4..52439cf65 100644
--- a/main.php
+++ b/main.php
@@ -241,7 +241,9 @@ if ($server > 0) {
                             $db_to_create   = '';
                             break;
                         } // end if
-                        else if ( (!PMA_DBI_try_query('USE ' . ereg_replace($re1 .'(%|_)', '\\1\\3', $show_grants_dbname)) && substr(PMA_DBI_getError(), 1, 4) != 1044)
+                        else if ( (ereg($re0 . '%|_', $show_grants_dbname) 
+                                  && !ereg('\\\\%|\\\\_', $show_grants_dbname))
+                                || (!PMA_DBI_try_query('USE ' . ereg_replace($re1 .'(%|_)', '\\1\\3', $show_grants_dbname)) && substr(PMA_DBI_getError(), 1, 4) != 1044)
                             ) {
                             $db_to_create = ereg_replace($re0 . '%', '\\1...', ereg_replace($re0 . '_', '\\1?', $show_grants_dbname));
                             $db_to_create = ereg_replace($re1 . '(%|_)', '\\1\\3', $db_to_create);