[PHP-CVS] cvs: php-src /main php_variables.c

[Antony Dovgal]

tony2001                Mon Jun  4 07:56:39 2007 UTC

  Modified files:              
    /php-src/main       php_variables.c 
  Log:
  no register_globals in HEAD
  
  
http://cvs.php.net/viewvc.cgi/php-src/main/php_variables.c?r1=1.140&r2=1.141&diff_format=u
Index: php-src/main/php_variables.c
diff -u php-src/main/php_variables.c:1.140 php-src/main/php_variables.c:1.141
--- php-src/main/php_variables.c:1.140  Sun Jun  3 16:53:37 2007
+++ php-src/main/php_variables.c        Mon Jun  4 07:56:39 2007
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: php_variables.c,v 1.140 2007/06/03 16:53:37 sniper Exp $ */
+/* $Id: php_variables.c,v 1.141 2007/06/04 07:56:39 tony2001 Exp $ */
 
 #include <stdio.h>
 #include "php.h"
@@ -136,11 +136,7 @@
                                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);

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php