The branch, QA_3_4 has been updated
via 58b48a3d4555d0469ee6fed361a9cf8820fb8c9d (commit)
from 9eba5726bd809ab874fc29360ac6ff351d86335b (commit)
- Log -----------------------------------------------------------------
commit 58b48a3d4555d0469ee6fed361a9cf8820fb8c9d
Author: Madhura Jayaratne <[email protected]>
Date: Thu Jul 21 08:55:57 2011 +0530
bug #3367986 [navi] Drop field -> lost active table
-----------------------------------------------------------------------
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 d3e081a..95bb4fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,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 a23d2fa..9cc2785 100644
--- a/libraries/header.inc.php
+++ b/libraries/header.inc.php
@@ -124,10 +124,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 9b19174..10e472a 100644
--- a/sql.php
+++ b/sql.php
@@ -760,7 +760,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
--
phpMyAdmin
------------------------------------------------------------------------------
5 Ways to Improve & Secure Unified Communications
Unified Communications promises greater efficiencies for business. UC can
improve internal communications as well as offer faster, more efficient ways
to interact with customers and streamline customer service. Learn more!
http://www.accelacomm.com/jaw/sfnl/114/51426253/
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
