From 646a613ebf00e98e914fc1c100a94a06376572f8 Mon Sep 17 00:00:00 2001 From: Marcus Boerger Date: Wed, 7 Jun 2006 09:23:58 +0000 Subject: [PATCH] - Fix issue with interfaces being inherited multiple times --- Zend/zend_compile.c | 2 +- Zend/zend_vm_def.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 7009b8f32e..56c87f86f3 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -2394,7 +2394,7 @@ ZEND_API void zend_do_implement_interface(zend_class_entry *ce, zend_class_entry if (i < parent_iface_num) { ignore = 1; } else { - zend_error(E_COMPILE_ERROR, "Class %s cannot implement previously implemented interface %s", ce->name, iface->name); + zend_error(E_COMPILE_ERROR, "Class %v cannot implement previously implemented interface %v", ce->name, iface->name); } } } diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index b521d37e92..0007203bfa 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -3740,8 +3740,6 @@ ZEND_VM_HANDLER(144, ZEND_ADD_INTERFACE, ANY, ANY) zend_error_noreturn(E_ERROR, "%v cannot implement %v - it is not an interface", ce->name, iface->name); } - ce->interfaces[opline->extended_value] = iface; - zend_do_implement_interface(ce, iface TSRMLS_CC); ZEND_VM_NEXT_OPCODE(); -- 2.50.1