diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-05-16 16:35:37 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-05-16 16:35:37 +0400 |
| commit | 5eb273cfecb2695e96841b0701bb5afd92325a23 (patch) | |
| tree | 1b25c0f224b80905b652531ea75379ba35fbf69b | |
| parent | 9d6b5e1f8edaf3058f63bc372f4aef0753e4636c (diff) | |
| parent | 06fe7e1e153381d08478f2cbe26a2296c280b2a0 (diff) | |
| download | php-git-5eb273cfecb2695e96841b0701bb5afd92325a23.tar.gz | |
Merge branch 'phpng' of git.php.net:php-src into phpng
* 'phpng' of git.php.net:php-src:
hash find returns zval* now
| -rw-r--r-- | Zend/zend_object_handlers.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c index 2459746892..a23fc42635 100644 --- a/Zend/zend_object_handlers.c +++ b/Zend/zend_object_handlers.c @@ -1091,7 +1091,7 @@ static union _zend_function *zend_std_get_method(zend_object **obj_ptr, zend_str if (EG(scope) && is_derived_class(fbc->common.scope, EG(scope)) && fbc->op_array.fn_flags & ZEND_ACC_CHANGED) { - if ((func = zend_hash_find(&EG(scope)->function_table, lc_method_name)) != SUCCESS) { + if ((func = zend_hash_find(&EG(scope)->function_table, lc_method_name)) == NULL) { zend_function *priv_fbc = Z_FUNC_P(func); if (priv_fbc->common.fn_flags & ZEND_ACC_PRIVATE && priv_fbc->common.scope == EG(scope)) { |