From: Ilia Alshanetsky <iliaa@php.net>
Date: Sat, 7 Dec 2002 16:06:40 +0000 (+0000)
Subject: MFH
X-Git-Tag: php-4.3.0RC3~42
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e2e2111b1cb13ed722b4959f2473276967442c1e;p=php

MFH
---

diff --git a/main/php_variables.c b/main/php_variables.c
index 73e19a856a..fbf762ee3e 100644
--- a/main/php_variables.c
+++ b/main/php_variables.c
@@ -70,15 +70,15 @@ PHPAPI void php_register_variable_ex(char *var, zval *val, pval *track_vars_arra
 
 	assert(var != NULL);
 	
-	if (PG(register_globals)) {
-		symtable1 = EG(active_symbol_table);
-	}
 	if (track_vars_array) {
+		symtable1 = Z_ARRVAL_P(track_vars_array);
+	}
+	if (PG(register_globals)) {
 		if (symtable1) {
-			symtable2 = Z_ARRVAL_P(track_vars_array);
+			symtable2 = EG(active_symbol_table);
 		} else {
-			symtable1 = Z_ARRVAL_P(track_vars_array);
-		}
+			symtable1 = EG(active_symbol_table);
+		}	
 	}
 	if (!symtable1) {
 		/* Nothing to do */