svn: /php/php-src/branches/PHP_5_3_2/ ext/standard/array.c
| From: | Johannes Schlüter | Date: | Mon, 25 Jan 2010 14:11:32 +0000 |
| Subject: | svn: /php/php-src/branches/PHP_5_3_2/ ext/standard/array.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-61617@lists.php.net to get a copy of this message | ||
johannes Mon, 25 Jan 2010 14:11:32 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=293982
Log:
merge r292594: fix the fix for #47409 (tony2001)
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/
U php/php-src/branches/PHP_5_3_2/ext/standard/array.c
Property changes on: php/php-src/branches/PHP_5_3_2
___________________________________________________________________
Modified: svn:mergeinfo
- /php/php-src/branches/PHP_5_3:292504,292574
/php/php-src/trunk:284726
+ /php/php-src/branches/PHP_5_3:292504,292574,292594
/php/php-src/trunk:284726
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-25 14:07:05 UTC (rev 293981)
+++ php/php-src/branches/PHP_5_3_2/ext/standard/array.c 2010-01-25 14:11:32 UTC (rev 293982)
@@ -1383,7 +1383,7 @@
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) {
+ if (var_exists && var_name_len == sizeof("this") &&
!strcmp(var_name, "this") && EG(scope) && EG(scope)->name_length != 0)
{
break;
}
ZVAL_STRINGL(&final_name, var_name, var_name_len, 1);