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

bug 851564

Browse Source
This commit is contained in:
Marc Delisle
2003-12-09 15:07:19 +00:00
parent cf04747274
commit 20e1209f96
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -7,6 +7,8 @@ $Source$
2003-12-09 Marc Delisle <lem9@users.sourceforge.net> 2003-12-09 Marc Delisle <lem9@users.sourceforge.net>
* libraries/sqlparser.data.php: bug 854702: FORCE INDEX * libraries/sqlparser.data.php: bug 854702: FORCE INDEX
* main.php: bug 851564: backquotes on the wildcard dbname
when no controluser is defined
2003-12-08 Garvin Hicking <embatag@supergarv.de> 2003-12-08 Garvin Hicking <embatag@supergarv.de>
* tbl_change.php: Fixed Bug #856436 (not displaying default values) * tbl_change.php: Fixed Bug #856436 (not displaying default values)

5
main.php
View File

@@ -168,6 +168,8 @@ $is_superuser = FALSE;
if ($server > 0) { if ($server > 0) {
// Get user's global privileges ($dbh and $userlink are links to MySQL // Get user's global privileges ($dbh and $userlink are links to MySQL
// defined in the "common.lib.php" library) // defined in the "common.lib.php" library)
// Note: if no controluser is defined, $dbh contains $userlink
$is_create_priv = FALSE; $is_create_priv = FALSE;
$is_process_priv = TRUE; $is_process_priv = TRUE;
$is_reload_priv = FALSE; $is_reload_priv = FALSE;
@@ -197,7 +199,6 @@ if ($server > 0) {
mysql_free_result($rs_usr); mysql_free_result($rs_usr);
} // end if } // end if
} // end if } // end if
// If the user has Create priv on a inexistant db, show him in the dialog // If the user has Create priv on a inexistant db, show him in the dialog
// the first inexistant db name that we find, in most cases it's probably // the first inexistant db name that we find, in most cases it's probably
// the one he just dropped :) // the one he just dropped :)
@@ -245,6 +246,8 @@ if ($server > 0) {
else if (ereg($re0 . '%|_', $show_grants_dbname) || !PMA_mysql_select_db($show_grants_dbname, $userlink) && @mysql_errno() != 1044) { else if (ereg($re0 . '%|_', $show_grants_dbname) || !PMA_mysql_select_db($show_grants_dbname, $userlink) && @mysql_errno() != 1044) {
$db_to_create = ereg_replace($re0 . '%', '\\1...', ereg_replace($re0 . '_', '\\1?', $show_grants_dbname)); $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); $db_to_create = ereg_replace($re1 . '(%|_)', '\\1\\3', $db_to_create);
// and remove backquotes
$db_to_create = str_replace('`','',$db_to_create);
$is_create_priv = TRUE; $is_create_priv = TRUE;
break; break;
} // end elseif } // end elseif