diff --git a/ChangeLog b/ChangeLog
index 633aa0c22..f5b2d2b6b 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2005-03-03 Alexander M. Turek  <me@derrabus.de>
+    * libraries/grab_globals.lib.php: Bug #1153079 (Updating columns starting
+      with "str").
+
 2005-03-02 Michal Čihař  <michal@cihar.com>
     * libraries/export/sql.php, libraries/display_export.lib.php: Do not offer
       modes not available in current MySQL version, do not fail on error when
diff --git a/libraries/grab_globals.lib.php b/libraries/grab_globals.lib.php
index 48e582fe2..6382eba5f 100644
--- a/libraries/grab_globals.lib.php
+++ b/libraries/grab_globals.lib.php
@@ -12,7 +12,7 @@
  * loic1 - 2001/25/11: use the new globals arrays defined with php 4.1+
  */
 
-function PMA_gpc_extract($array, &$target) {
+function PMA_gpc_extract($array, &$target, $sanitize = TRUE) {
     if (!is_array($array)) {
         return FALSE;
     }
@@ -30,7 +30,7 @@ function PMA_gpc_extract($array, &$target) {
          * Warning: this also affects array keys:
          * Variables like $_GET['harmless']['cfg'] will also be rejected!
          */
-        if (is_string($key) && (
+        if ($sanitize && is_string($key) && (
             $key == 'cfg'
             || $key == 'GLOBALS'
             || substr($key, 0, 3) == 'str'
@@ -43,7 +43,7 @@ function PMA_gpc_extract($array, &$target) {
             // another application, with the same name as this array
             unset($target[$key]);
 
-            PMA_gpc_extract($value, $target[$key]);
+            PMA_gpc_extract($value, $target[$key], FALSE);
         } else if ($is_magic_quotes) {
             $target[$key] = stripslashes($value);
         } else {