1 files changed, 4 insertions, 12 deletions

diff --git a/Zend/zend_interfaces.c b/Zend/zend_interfaces.c
index c53a657c66..8a10f18ba9 100755
--- a/Zend/zend_interfaces.c
+++ b/Zend/zend_interfaces.c
@@ -322,11 +322,11 @@ static int zend_implement_traversable(zend_class_entry *interface, zend_class_en
 		return SUCCESS;
 	}
 	for (i = 0; i < class_type->num_interfaces; i++) {
-		if (class_type->interfaces[i] == zend_ce_aggregate || class_type->interfaces[i] == zend_ce_iterator) {
+		if (class_type->interfaces[i] == U_CLASS_ENTRY(zend_ce_aggregate) || class_type->interfaces[i] == U_CLASS_ENTRY(zend_ce_iterator)) {
 			return SUCCESS;
 		}
 	}
-	zend_error(E_CORE_ERROR, "Class %v must implement interface %v as part of either %v or %v",
+	zend_error(E_CORE_ERROR, "Class %v must implement interface %s as part of either %s or %s",
 		class_type->name,
 		zend_ce_traversable->name,
 		zend_ce_iterator->name,
@@ -348,10 +348,10 @@ static int zend_implement_aggregate(zend_class_entry *interface, zend_class_entr
 			/* c-level get_iterator cannot be changed (exception being only Traversable is implmented) */
 			if (class_type->num_interfaces) {
 				for (i = 0; i < class_type->num_interfaces; i++) {
-					if (class_type->interfaces[i] == zend_ce_iterator) {
+					if (class_type->interfaces[i] == U_CLASS_ENTRY(zend_ce_iterator)) {
 						return FAILURE;
 					}
-					if (class_type->interfaces[i] == zend_ce_traversable) {
+					if (class_type->interfaces[i] == U_CLASS_ENTRY(zend_ce_traversable)) {
 						t = i;
 					}
 				}
@@ -562,14 +562,6 @@ ZEND_API void zend_register_interfaces(TSRMLS_D)
 }
 /* }}} */
 
-void init_interfaces(TSRMLS_D)
-{
-	zend_ce_traversable = zend_get_named_class_entry("Traversable", sizeof("Traversable")-1 TSRMLS_CC);
-	zend_ce_aggregate = zend_get_named_class_entry("IteratorAggregate", sizeof("IteratorAggregate")-1 TSRMLS_CC);
-	zend_ce_iterator = zend_get_named_class_entry("Iterator", sizeof("Iterator")-1 TSRMLS_CC);
-	zend_ce_arrayaccess = zend_get_named_class_entry("ArrayAccess", sizeof("ArrayAccess")-1 TSRMLS_CC);
-}
-
 /*
  * Local variables:
  * tab-width: 4