diff --git a/ChangeLog b/ChangeLog
index b6358fde7..475f3844e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - bug [lang] catalan wrong accented characters
 - bug #1893034 [Export] SET NAMES for importing with command-line client 
 + [lang] Russian update, thanks to Victor Volkov
+- bug #1910485 [core] Unsetting the whitelist during the loop,
+  thanks to Jeroen Vrijkorte - jv_map
 
 2.11.5.0 (2008-03-01)
 - bug #1862661 [GUI] Warn about rename deleting database 
diff --git a/libraries/common.inc.php b/libraries/common.inc.php
index e944d2a7b..a7f4e7209 100644
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -129,6 +129,7 @@ foreach ($GLOBALS as $key => $dummy) {
         die('numeric key detected');
     }
 }
+unset($dummy);
 
 /**
  * PATH_INFO could be compromised if set, so remove it from PHP_SELF
@@ -147,7 +148,8 @@ $PMA_PHP_SELF = htmlspecialchars($PMA_PHP_SELF);
 
 /**
  * just to be sure there was no import (registering) before here
- * we empty the global space
+ * we empty the global space (but avoid unsetting $variables_list
+ * and $key in the foreach(), we still need them!)
  */
 $variables_whitelist = array (
     'GLOBALS',
@@ -160,6 +162,8 @@ $variables_whitelist = array (
     '_COOKIE',
     '_SESSION',
     'PMA_PHP_SELF',
+    'variables_whitelist',
+    'key'
 );
 
 foreach (get_defined_vars() as $key => $value) {