cvs: ZendEngine2(PHP_5_2) / zend_compile.c

tony2001 Mon May 29 21:28:29 2006 UTC Modified files: (Branch: PHP_5_2) /ZendEngine2 zend_compile.c Log: MFH: there is no ce at this point, revert this line to its previous state http://cvs.php.net/viewcvs.cgi/ZendEngine2/zend_compile.c?r1=1.647.2.27.2.6&r2=1.647.2.27.2.7&diff_format=u Index: ZendEngine2/zend_compile.c diff -u ZendEngine2/zend_compile.c:1.647.2.27.2.6 ZendEngine2/zend_compile.c:1.647.2.27.2.7 --- ZendEngine2/zend_compile.c:1.647.2.27.2.6 Mon May 29 20:06:43 2006 +++ ZendEngine2/zend_compile.c Mon May 29 21:28:29 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_compile.c,v 1.647.2.27.2.6 2006/05/29 20:06:43 helly Exp $ */ +/* $Id: zend_compile.c,v 1.647.2.27.2.7 2006/05/29 21:28:29 tony2001 Exp $ */ #include <zend_language_parser.h> #include "zend.h" @@ -2333,7 +2333,7 @@ * so we shut up about it. This allows the if (!defined('FOO')) { return; } * approach to work. */ - zend_error(E_COMPILE_ERROR, "Cannot redeclare class %s", ce->name); + zend_error(E_COMPILE_ERROR, "Cannot redeclare class %s", opline->op2.u.constant.value.str.val); } return NULL; } else {