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

MFH: there is no ce at this point, revert this line to its previous state
---

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index cf2c7fe3d0..4b5410ac72 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -2333,7 +2333,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 %s", ce->name);
+			zend_error(E_COMPILE_ERROR, "Cannot redeclare class %s", opline->op2.u.constant.value.str.val);
 		}
 		return NULL;
 	} else {