cvs: ZendEngine2 / zend_compile.c
| From: | Zeev Suraski | Date: | Wed, 04 Feb 2004 17:57:48 +0000 |
| Subject: | cvs: ZendEngine2 / zend_compile.c | ||
| Groups: | php.zend-engine.cvs | ||
| Request: | Send a blank email to php-zend-engine-cvs+get-2322@lists.php.net to get a copy of this message | ||
zeev Wed Feb 4 12:57:48 2004 EDT
Modified files:
/ZendEngine2 zend_compile.c
Log:
Fix handling of $this in some cases
http://cvs.php.net/diff.php/ZendEngine2/zend_compile.c?r1=1.534&r2=1.535&ty=u
Index: ZendEngine2/zend_compile.c
diff -u ZendEngine2/zend_compile.c:1.534 ZendEngine2/zend_compile.c:1.535
--- ZendEngine2/zend_compile.c:1.534 Wed Feb 4 12:10:44 2004
+++ ZendEngine2/zend_compile.c Wed Feb 4 12:57:48 2004
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_compile.c,v 1.534 2004/02/04 17:10:44 zeev Exp $ */
+/* $Id: zend_compile.c,v 1.535 2004/02/04 17:57:48 zeev Exp $ */
#include "zend_language_parser.h"
#include "zend.h"
@@ -466,7 +466,7 @@
static zend_bool opline_is_fetch_this(zend_op *opline TSRMLS_DC)
{
- if (CG(active_class_entry) && (opline->opcode == ZEND_FETCH_W) &&
(opline->op1.op_type == IS_CONST)
+ if ((opline->opcode == ZEND_FETCH_W) && (opline->op1.op_type == IS_CONST)
&& (opline->op1.u.constant.type == IS_STRING)
&& (opline->op1.u.constant.value.str.len == (sizeof("this")-1))
&& !memcmp(opline->op1.u.constant.value.str.val, "this",
sizeof("this"))) {