johannes Wed, 20 Jan 2010 16:07:10 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=293778
Log: Merge 292549: Fixed bug #47409 (extract() problem with array containing word "this"). (iliaa) Bug: http://bugs.php.net/47409 (Closed) extract() problem with array containing word "this" Changed paths: U php/php-src/branches/PHP_5_3_2/NEWS U php/php-src/branches/PHP_5_3_2/ext/standard/array.c Modified: php/php-src/branches/PHP_5_3_2/NEWS =================================================================== --- php/php-src/branches/PHP_5_3_2/NEWS 2010-01-20 16:02:28 UTC (rev 293777) +++ php/php-src/branches/PHP_5_3_2/NEWS 2010-01-20 16:07:10 UTC (rev 293778) @@ -1,6 +1,8 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 20??, PHP 5.3.2 RC 2 +- Fixed bug #47409 (extract() problem with array containing word "this"). + (Ilia, chrisstocktonaz at gmail dot com) 22 Dec 2009, PHP 5.3.2 RC 1 Modified: php/php-src/branches/PHP_5_3_2/ext/standard/array.c =================================================================== --- php/php-src/branches/PHP_5_3_2/ext/standard/array.c 2010-01-20 16:02:28 UTC (rev 293777) +++ php/php-src/branches/PHP_5_3_2/ext/standard/array.c 2010-01-20 16:07:10 UTC (rev 293778) @@ -1383,6 +1383,9 @@ if (var_exists && var_name_len == sizeof("GLOBALS") && !strcmp(var_name, "GLOBALS")) { break; } + if (var_exists && var_name_len == sizeof("this") && !strcmp(var_name, "this") && EG(scope) && "" != EG(scope)->name) { + break; + } ZVAL_STRINGL(&final_name, var_name, var_name_len, 1); break;
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
