no need to globalize $_REQUEST['is_js_confirmed']

This commit is contained in:
Sebastian Mendel
2007-03-27 11:29:18 +00:00
parent e63059cbaa
commit c28969acbd
2 changed files with 6 additions and 14 deletions

View File

@@ -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
*/

View File

@@ -179,15 +179,11 @@ 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 (! $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 {