[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_5RC1-6-g053d6ca
Marc Delisle
lem9 at users.sourceforge.net
Sun Jul 25 19:32:44 CEST 2010
The branch, QA_3_3 has been updated
via 053d6ca88e1a72a839f517b22f3389f59575baf7 (commit)
from 368cf8d74f77cf71d279c1c87f4feac4c862c44f (commit)
- Log -----------------------------------------------------------------
commit 053d6ca88e1a72a839f517b22f3389f59575baf7
Author: Marc Delisle <marc at infomarc.info>
Date: Sun Jul 25 13:32:35 2010 -0400
bug #3033063 [core] Navi gets wrong db name
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 1 +
server_privileges.php | 5 +++++
2 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index fc317e9..d7cb453 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 fd2796f..3f14c3f 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);
hooks/post-receive
--
phpMyAdmin
More information about the Git
mailing list