From 92b59f81d0b12004b7cae119853cf8bffb43044b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Johannes=20Schl=C3=BCter?= Date: Wed, 20 Jan 2010 16:07:10 +0000 Subject: [PATCH] Merge 292549: Fixed bug #47409 (extract() problem with array containing word "this"). (iliaa) --- NEWS | 2 ++ ext/standard/array.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/NEWS b/NEWS index ab35a77708..b45719fa0a 100644 --- a/NEWS +++ b/NEWS @@ -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 diff --git a/ext/standard/array.c b/ext/standard/array.c index 70a47477dc..2d29984da6 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -1383,6 +1383,9 @@ 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) { + break; + } ZVAL_STRINGL(&final_name, var_name, var_name_len, 1); break; -- 2.50.1