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

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index ed6bf9646eac3503d427b26685df403ef0ff6202..f3089fa390c86aee50a3f83f72205457cfda97d6 100644 (file)
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -2472,7 +2472,7 @@ ZEND_API zend_class_entry *do_bind_inherited_class(zend_op *opline, HashTable *c
                         * 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 {