From: Johannes Schlüter <johannes@php.net>
Date: Mon, 25 Jan 2010 14:11:32 +0000 (+0000)
Subject: merge r292594: fix the fix for #47409 (tony2001)
X-Git-Tag: php-5.3.2RC2~110
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ba11bd5dcf2aad5df1e814a23bb95f77f525664d;p=php

merge r292594: fix the fix for #47409 (tony2001)
---

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);