nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

no need to globalize $_REQUEST['is_js_confirmed']

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/common.inc.php
View File

@@ -857,10 +857,6 @@ if (! defined('PMA_MINIMUM_COMMON')) {
} // end if !defined('PMA_MINIMUM_COMMON') } // end if !defined('PMA_MINIMUM_COMMON')
if (!empty($__redirect) && in_array($__redirect, $goto_whitelist)) { 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 * include subform target page
*/ */

16
sql.php
View File

@@ -179,16 +179,12 @@ if (isset($btnDrop) && $btnDrop == $strNo) {
* *
* Also bypassed if only showing php code.or validating a SQL query * Also bypassed if only showing php code.or validating a SQL query
*/ */
if (!$cfg['Confirm'] if (! $cfg['Confirm'] || isset($_REQUEST['is_js_confirmed']) || isset($btnDrop)
|| (isset($is_js_confirmed) && $is_js_confirmed) // if we are coming from a "Create PHP code" or a "Without PHP Code"
|| isset($btnDrop) // dialog, we won't execute the query anyway, so don't confirm
//|| !empty($GLOBALS['show_as_php'])
// if we are coming from a "Create PHP code" or a "Without PHP Code" || isset($GLOBALS['show_as_php'])
// dialog, we won't execute the query anyway, so don't confirm || !empty($GLOBALS['validatequery'])) {
//|| !empty($GLOBALS['show_as_php'])
|| isset($GLOBALS['show_as_php'])
|| !empty($GLOBALS['validatequery'])) {
$do_confirm = false; $do_confirm = false;
} else { } else {
$do_confirm = isset($analyzed_sql[0]['queryflags']['need_confirm']); $do_confirm = isset($analyzed_sql[0]['queryflags']['need_confirm']);