From: Derick Rethans Date: Fri, 29 Mar 2002 12:34:25 +0000 (+0000) Subject: - revert patch X-Git-Tag: php-4.3.0dev-ZendEngine2-Preview1~972 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=17116438da18a5e7fdb3f56248a244c242a58956;p=php - revert patch --- diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 18428eddd1..e9cb8ccbac 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -924,9 +924,7 @@ void zend_do_begin_function_declaration(znode *function_token, znode *function_n op_array.scope = CG(active_class_entry); if (is_method) { - if (zend_hash_add(&CG(active_class_entry)->function_table, name, name_len+1, &op_array, sizeof(zend_op_array), (void **) &CG(active_op_array)) == FAILURE) { - zend_error(E_ERROR, "Cannot redeclare method %s()", name); - } + zend_hash_update(&CG(active_class_entry)->function_table, name, name_len+1, &op_array, sizeof(zend_op_array), (void **) &CG(active_op_array)); if ((CG(active_class_entry)->name_length == (uint) name_len) && (!memcmp(CG(active_class_entry)->name, name, name_len))) { CG(active_class_entry)->constructor = (zend_function *) CG(active_op_array); } else if ((function_name->u.constant.value.str.len == sizeof(ZEND_CONSTRUCTOR_FUNC_NAME)-1) && (!memcmp(function_name->u.constant.value.str.val, ZEND_CONSTRUCTOR_FUNC_NAME, sizeof(ZEND_CONSTRUCTOR_FUNC_NAME)))) {