[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_3-4115-g62556cb

[Marc Delisle]

The branch, master has been updated
       via  62556cb5b61be5ceb30219bf778154a6da4c363d (commit)
       via  f483cdb1233ea9db1d3d85d498f2ad22b6f578ee (commit)
      from  dd334398aeeb402a6dd20f02ecab36da08a37bef (commit)


- Log -----------------------------------------------------------------
commit 62556cb5b61be5ceb30219bf778154a6da4c363d
Merge: dd334398aeeb402a6dd20f02ecab36da08a37bef f483cdb1233ea9db1d3d85d498f2ad22b6f578ee
Author: Marc Delisle <marc at infomarc.info>
Date:   Fri May 28 13:07:29 2010 -0400

    Merge branch 'QA_3_3'

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

Summary of changes:
 ChangeLog            |    1 +
 server_databases.php |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4a5b826..d1ad534 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -89,6 +89,7 @@ $Id$
 - [browse] Fix handling of sort order if only column is specified.
 + [lang] Greek update, thanks to Panagiotis Papazoglou - panos78
 + [lang] Updated lot of translation based on work done in master branch.
+- bug #3008411 [databases] Last dropped database remains active in navi
 
 3.3.3.0 (2010-05-10)
 - patch #2982480 [navi] Do not group if there would be one table in group,
diff --git a/server_databases.php b/server_databases.php
index 7b0f698..bfb2946 100644
--- a/server_databases.php
+++ b/server_databases.php
@@ -58,7 +58,7 @@ if ((isset($_REQUEST['drop_selected_dbs']) || isset($_REQUEST['query_type']))
             $selected_db = $_REQUEST['selected_dbs'];
         }
         require './libraries/mult_submits.inc.php';
-        unset($action, $submit_mult, $err_url, $selected_db);
+        unset($action, $submit_mult, $err_url, $selected_db, $GLOBALS['db']);
         if (empty($message)) {
             $message = PMA_Message::success(__('%s databases have been dropped successfully.'));
             if ($mult_btn == __('Yes')) {


hooks/post-receive
-- 
phpMyAdmin