From: Antony Dovgal <tony2001@php.net>
Date: Mon, 4 Jun 2007 07:56:39 +0000 (+0000)
Subject: no register_globals in HEAD
X-Git-Tag: BEFORE_IMPORT_OF_MYSQLND~541
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ecd414c3b87c1869d324d0bd4620111b2ef9c9f5;p=php

no register_globals in HEAD
---

diff --git a/main/php_variables.c b/main/php_variables.c
index f75df45e05..5f2877bc31 100644
--- 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);