From c28969acbd8defc8a1cdd3a8ca3b2078593edbf4 Mon Sep 17 00:00:00 2001
From: Sebastian Mendel <cybot_tm@users.sourceforge.net>
Date: Tue, 27 Mar 2007 11:29:18 +0000
Subject: [PATCH] no need to globalize $_REQUEST['is_js_confirmed']

---
 libraries/common.inc.php |  4 ----
 sql.php                  | 16 ++++++----------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/libraries/common.inc.php b/libraries/common.inc.php
index afa534196..f546c6900 100644
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -857,10 +857,6 @@ if (! defined('PMA_MINIMUM_COMMON')) {
 } // end if !defined('PMA_MINIMUM_COMMON')
 
 if (!empty($__redirect) && in_array($__redirect, $goto_whitelist)) {
-    // to handle bug #1388167
-    if (isset($_GET['is_js_confirmed'])) {
-        $is_js_confirmed = 1;
-    }
     /**
      * include subform target page
      */
diff --git a/sql.php b/sql.php
index cde8d439e..c7edd0de7 100644
--- a/sql.php
+++ b/sql.php
@@ -179,16 +179,12 @@ if (isset($btnDrop) && $btnDrop == $strNo) {
  *
  * Also bypassed if only showing php code.or validating a SQL query
  */
-if (!$cfg['Confirm']
-    || (isset($is_js_confirmed) && $is_js_confirmed)
-    || isset($btnDrop)
-
-    // if we are coming from a "Create PHP code" or a "Without PHP Code"
-    // dialog, we won't execute the query anyway, so don't confirm
-    //|| !empty($GLOBALS['show_as_php'])
-    || isset($GLOBALS['show_as_php'])
-
-    || !empty($GLOBALS['validatequery'])) {
+if (! $cfg['Confirm'] || isset($_REQUEST['is_js_confirmed']) || isset($btnDrop)
+ // if we are coming from a "Create PHP code" or a "Without PHP Code"
+ // dialog, we won't execute the query anyway, so don't confirm
+ //|| !empty($GLOBALS['show_as_php'])
+ || isset($GLOBALS['show_as_php'])
+ || !empty($GLOBALS['validatequery'])) {
     $do_confirm = false;
 } else {
     $do_confirm = isset($analyzed_sql[0]['queryflags']['need_confirm']);