Fixed the fix

This commit is contained in:
Alexander M. Turek
2005-02-24 17:30:02 +00:00
parent 296c925db6
commit 0aa14421f8
2 changed files with 6 additions and 2 deletions

View File

@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
$Id$
$Source$
2005-02-23 Alexander M. Turek <me@derrabus.de>
* libraries/grab_globals.lib.php: Fixed the fix, thanks to Marc. :-)
2005-02-23 Marc Delisle <lem9@users.sourceforge.net>
* libraries/auth/cookie.auth.lib.php: bug #1149373, error when
blowfish_secret is empty

View File

@@ -30,10 +30,11 @@ function PMA_gpc_extract($array, &$target) {
* Warning: this also affects array keys:
* Variables like $_GET['harmless']['cfg'] will also be rejected!
*/
if ($key == 'cfg'
if (is_string($key) && (
$key == 'cfg'
|| $key == 'GLOBALS'
|| substr($key, 0, 3) == 'str'
|| $key{0} == '_') {
|| $key{0} == '_')) {
continue;
}