cvs: ZendEngine2 / zend_compile.c

tony2001 Mon May 29 21:28:15 2006 UTC Modified files: /ZendEngine2 zend_compile.c Log: there is no ce at this point, revert this line to its previous state See also: http://news.php.net/php.zend-engine.cvs/4931 http://cvs.php.net/viewcvs.cgi/ZendEngine2/zend_compile.c?r1=1.709&r2=1.710&diff_format=u Index: ZendEngine2/zend_compile.c diff -u ZendEngine2/zend_compile.c:1.709 ZendEngine2/zend_compile.c:1.710 --- ZendEngine2/zend_compile.c:1.709 Mon May 29 19:57:43 2006 +++ ZendEngine2/zend_compile.c Mon May 29 21:28:15 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_compile.c,v 1.709 2006/05/29 19:57:43 helly Exp $ */ +/* $Id: zend_compile.c,v 1.710 2006/05/29 21:28:15 tony2001 Exp $ */ #include <zend_language_parser.h> #include "zend.h" @@ -2472,7 +2472,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 %v", ce->name); + zend_error(E_COMPILE_ERROR, "Cannot redeclare class %R", Z_TYPE(opline->op2.u.constant), Z_UNIVAL(opline->op2.u.constant)); } return NULL; } else {