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

Merge branch 'QA_3_3'

Browse Source
This commit is contained in:
Marc Delisle
2010-07-25 13:33:03 -04:00
parent 0a05b396b3 053d6ca88e
commit cdcc5d7443
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -98,6 +98,7 @@ $Id$
3.3.6.0 (not yet released) 3.3.6.0 (not yet released)
- bug #3031705 [core] Do not use CONCAT for DECIMAL fields. - bug #3031705 [core] Do not use CONCAT for DECIMAL fields.
- bug #3033063 [core] Navi gets wrong db name
3.3.5.0 (not yet released) 3.3.5.0 (not yet released)
- patch #2932113 [information_schema] Slow export when having lots of - patch #2932113 [information_schema] Slow export when having lots of

5
server_privileges.php
View File

@@ -971,6 +971,8 @@ if (isset($_REQUEST['adduser_submit']) || isset($_REQUEST['change_copy'])) {
$message = PMA_Message::rawError(PMA_DBI_getError()); $message = PMA_Message::rawError(PMA_DBI_getError());
break; break;
} }
// this is needed in case tracking is on:
$GLOBALS['db'] = $username;
$GLOBALS['reload'] = TRUE; $GLOBALS['reload'] = TRUE;
PMA_reloadNavigation(); PMA_reloadNavigation();
@@ -1284,6 +1286,9 @@ if (isset($_REQUEST['delete']) || (isset($_REQUEST['change_copy']) && $_REQUEST[
} }
} }
} }
// tracking sets this, causing the deleted db to be shown in navi
unset($GLOBALS['db']);
$sql_query = join("\n", $queries); $sql_query = join("\n", $queries);
if (! empty($drop_user_error)) { if (! empty($drop_user_error)) {
$message = PMA_Message::rawError($drop_user_error); $message = PMA_Message::rawError($drop_user_error);