diff options
| author | Rasmus Lerdorf <rasmus@php.net> | 2008-02-01 23:09:10 +0000 |
|---|---|---|
| committer | Rasmus Lerdorf <rasmus@php.net> | 2008-02-01 23:09:10 +0000 |
| commit | 45db15ad4e7b5e7fdb9bad55fcc03a46889e6ddd (patch) | |
| tree | 34150bbc43558b3d5e9ff28e30f77e4f60c79a79 /Zend/zend_API.c | |
| parent | e8a8acdf39a3b4256a671bbb1f6a399baa70cc27 (diff) | |
| download | php-git-45db15ad4e7b5e7fdb9bad55fcc03a46889e6ddd.tar.gz | |
Small tweak. Need to make array and string callback syntax behave the
same way. Also change "cannot" to "should not" since we obviously
"can" make the call.
Diffstat (limited to 'Zend/zend_API.c')
| -rw-r--r-- | Zend/zend_API.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c index 2b91a12be8..8ab24e6cf3 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -2412,9 +2412,9 @@ static int zend_is_callable_check_func(int check_flags, zval ***zobj_ptr_ptr, ze } } else { if (error) { - zend_spprintf(error, 0, "non-static method %s::%s() cannot be called statically", (*ce_ptr)->name, fptr->common.function_name); + zend_spprintf(error, 0, "non-static method %s::%s() should not be called statically", (*ce_ptr)->name, fptr->common.function_name); } else if (retval) { - zend_error(E_STRICT, "Non-static method %s::%s() cannot be called statically", (*ce_ptr)->name, fptr->common.function_name); + zend_error(E_STRICT, "Non-static method %s::%s() should not be called statically", (*ce_ptr)->name, fptr->common.function_name); } } } @@ -2478,7 +2478,7 @@ ZEND_API zend_bool zend_is_callable_ex(zval *callable, uint check_flags, char ** return 1; } - return zend_is_callable_check_func(check_flags|IS_CALLABLE_CHECK_IS_STATIC, zobj_ptr_ptr, NULL, callable, ce_ptr, fptr_ptr, error TSRMLS_CC); + return zend_is_callable_check_func(check_flags, zobj_ptr_ptr, NULL, callable, ce_ptr, fptr_ptr, error TSRMLS_CC); case IS_ARRAY: { |