The branch, master has been updated via 167d10385d610ec235d791d9b76da7bfdb008363 (commit) via 58b48a3d4555d0469ee6fed361a9cf8820fb8c9d (commit) from 75bb94f923ab454fe0db509996793d0164c5e103 (commit)

- Log ----------------------------------------------------------------- commit 167d10385d610ec235d791d9b76da7bfdb008363 Merge: 75bb94f923ab454fe0db509996793d0164c5e103 58b48a3d4555d0469ee6fed361a9cf8820fb8c9d Author: Madhura Jayaratne madhura.cj@gmail.com Date: Thu Jul 21 08:59:35 2011 +0530

Merge branch 'QA_3_4'

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

Summary of changes: ChangeLog | 1 + libraries/header.inc.php | 5 ++--- sql.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog index d438c06..94861f5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -52,6 +52,7 @@ phpMyAdmin - ChangeLog - remove version number in /setup - bug #3367993 [usability] Missing "Generate Password" button - bug #3363221 [display] Missing Server Parameter on inline sql query +- bug #3367986 [navi] Drop field -> lost active table

3.4.3.1 (2011-07-02) - [security] Fixed possible session manipulation in swekey authentication, see PMASA-2011-5 diff --git a/libraries/header.inc.php b/libraries/header.inc.php index 80763e7..270b421 100644 --- a/libraries/header.inc.php +++ b/libraries/header.inc.php @@ -138,10 +138,9 @@ if (isset($GLOBALS['is_ajax_request']) && !$GLOBALS['is_ajax_request']) { htmlspecialchars($GLOBALS['db']), __('Database'), 's_db.png'); - // if the table is being dropped, $_REQUEST['purge'] is set - // (it always contains "1") + // if the table is being dropped, $_REQUEST['purge'] is set to '1' // so do not display the table name in upper div - if (strlen($GLOBALS['table']) && ! (isset($_REQUEST['purge']))) { + if (strlen($GLOBALS['table']) && ! (isset($_REQUEST['purge']) && $_REQUEST['purge'] == '1')) { require_once './libraries/tbl_info.inc.php';

echo $separator; diff --git a/sql.php b/sql.php index 543c115..6d705fc 100644 --- a/sql.php +++ b/sql.php @@ -821,7 +821,7 @@ if (0 == $num_rows || $is_affected) { $goto = PMA_securePath($goto); // Checks for a valid target script $is_db = $is_table = false; - if (isset($_REQUEST['purge'])) { + if (isset($_REQUEST['purge']) && $_REQUEST['purge'] == '1') { $table = ''; unset($url_params['table']); }

hooks/post-receive