From: Antony Dovgal <tony2001@php.net>
Date: Mon, 29 May 2006 21:28:15 +0000 (+0000)
Subject: there is no ce at this point, revert this line to its previous state
X-Git-Tag: BEFORE_NEW_OUTPUT_API~42
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2acd363bbe00f93dd39ba7560d062e0891ad4a01;p=php

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 ed6bf9646e..f3089fa390 100644
--- 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 {