From 053d6ca88e1a72a839f517b22f3389f59575baf7 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sun, 25 Jul 2010 13:32:35 -0400 Subject: [PATCH] bug #3033063 [core] Navi gets wrong db name --- ChangeLog | 1 + server_privileges.php | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/ChangeLog b/ChangeLog index fc317e937..d7cb453b0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA 3.3.6.0 (not yet released) - 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) - patch #2932113 [information_schema] Slow export when having lots of diff --git a/server_privileges.php b/server_privileges.php index fd2796f2d..3f14c3f93 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -942,6 +942,8 @@ if (isset($_REQUEST['adduser_submit']) || isset($_REQUEST['change_copy'])) { $message = PMA_Message::rawError(PMA_DBI_getError()); break; } + // this is needed in case tracking is on: + $GLOBALS['db'] = $username; $GLOBALS['reload'] = TRUE; PMA_reloadNavigation(); @@ -1255,6 +1257,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); if (! empty($drop_user_error)) { $message = PMA_Message::rawError($drop_user_error);