From ba11bd5dcf2aad5df1e814a23bb95f77f525664d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Johannes=20Schl=C3=BCter?= Date: Mon, 25 Jan 2010 14:11:32 +0000 Subject: [PATCH] merge r292594: fix the fix for #47409 (tony2001) --- ext/standard/array.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/standard/array.c b/ext/standard/array.c index 2d29984da6..1988ea3a44 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -1383,7 +1383,7 @@ PHP_FUNCTION(extract) 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); -- 2.50.1