diff --git a/ChangeLog b/ChangeLog
index 47a78473f..1df522c7c 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/libraries/grab_globals.lib.php b/libraries/grab_globals.lib.php
index a74657c78..48e582fe2 100644
--- a/libraries/grab_globals.lib.php
+++ b/libraries/grab_globals.lib.php
@@ -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;
         }