diff options
| author | Derick Rethans <derick@php.net> | 2002-03-29 12:34:25 +0000 |
|---|---|---|
| committer | Derick Rethans <derick@php.net> | 2002-03-29 12:34:25 +0000 |
| commit | 17116438da18a5e7fdb3f56248a244c242a58956 (patch) | |
| tree | 2caaf0bdc0176877cc2da438b5abda8d5a6bd619 | |
| parent | c7d72bb20d73bf52b9fb7379c29b03d5daf02957 (diff) | |
| download | php-git-17116438da18a5e7fdb3f56248a244c242a58956.tar.gz | |
- revert patch
| -rw-r--r-- | Zend/zend_compile.c | 4 |
1 files changed, 1 insertions, 3 deletions
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)))) { |