no register_globals in HEAD

diff --git a/main/php_variables.c b/main/php_variables.c
index f75df45e05dd6a896426de6b752e0ceef498b9a5..5f2877bc3144121e4292678b2ba0d1d94d62b28f 100644 (file)
--- a/main/php_variables.c
+++ b/main/php_variables.c
@@ -136,11 +136,7 @@ PHPAPI void php_register_variable_ex(char *var, zval *val, zval *track_vars_arra
                                HashTable *ht;
                                /* too many levels of nesting */
 
-                               if (track_vars_array) {
-                                       ht = Z_ARRVAL_P(track_vars_array);
-                               } else if (PG(register_globals)) {
-                                       ht = EG(active_symbol_table);
-                               }
+                               ht = Z_ARRVAL_P(track_vars_array);
 
                                zend_hash_del(ht, var, var_len + 1);
                                zval_dtor(val);