[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5RC1-5920-gcdcc5d7

[Marc Delisle]

The branch, master has been updated
       via  cdcc5d74437e0cf21e797fb5935bce39cbf540f7 (commit)
       via  053d6ca88e1a72a839f517b22f3389f59575baf7 (commit)
       via  368cf8d74f77cf71d279c1c87f4feac4c862c44f (commit)
      from  0a05b396b366460ca1ffaae2cc3ba3bd5404e1de (commit)


- Log -----------------------------------------------------------------
commit cdcc5d74437e0cf21e797fb5935bce39cbf540f7
Merge: 0a05b396b366460ca1ffaae2cc3ba3bd5404e1de 053d6ca88e1a72a839f517b22f3389f59575baf7
Author: Marc Delisle <marc at infomarc.info>
Date:   Sun Jul 25 13:33:03 2010 -0400

    Merge branch 'QA_3_3'

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog             |    1 +
 server_privileges.php |    5 +++++
 2 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4e2e9ae..dfdf92f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -98,6 +98,7 @@ $Id$
 
 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 bd2ddb3..9577d77 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -971,6 +971,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();
 
@@ -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);
             if (! empty($drop_user_error)) {
                 $message = PMA_Message::rawError($drop_user_error);


hooks/post-receive
-- 
phpMyAdmin