diff options
| author | Dmitry Stogov <dmitry@php.net> | 2008-07-26 13:14:04 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2008-07-26 13:14:04 +0000 |
| commit | af05ce0af6d35e668de297fc4961fa738272f13c (patch) | |
| tree | 32d1f47915557308aa7e2f9212abb3a572b4b207 /Zend/zend_API.h | |
| parent | 77baec3f6d57f2d37e89aceb758c6adf6a9538f6 (diff) | |
| download | php-git-af05ce0af6d35e668de297fc4961fa738272f13c.tar.gz | |
Fixed is_callable/call_user_func mess that had done different things for very similar arguments e.g. array("A","B") and "A::B"
Diffstat (limited to 'Zend/zend_API.h')
| -rw-r--r-- | Zend/zend_API.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Zend/zend_API.h b/Zend/zend_API.h index 39c1655036..9760cb7fc4 100644 --- a/Zend/zend_API.h +++ b/Zend/zend_API.h @@ -273,10 +273,11 @@ ZEND_API void zend_wrong_param_count(TSRMLS_D); #define IS_CALLABLE_CHECK_SYNTAX_ONLY (1<<0) #define IS_CALLABLE_CHECK_NO_ACCESS (1<<1) #define IS_CALLABLE_CHECK_IS_STATIC (1<<2) +#define IS_CALLABLE_CHECK_SILENT (1<<3) #define IS_CALLABLE_STRICT (IS_CALLABLE_CHECK_IS_STATIC) -ZEND_API zend_bool zend_is_callable_ex(zval *callable, uint check_flags, char **callable_name, int *callable_name_len, zend_fcall_info_cache *fcc, char **error TSRMLS_DC); +ZEND_API zend_bool zend_is_callable_ex(zval *callable, zval **object_pp, uint check_flags, char **callable_name, int *callable_name_len, zend_fcall_info_cache *fcc, char **error TSRMLS_DC); ZEND_API zend_bool zend_is_callable(zval *callable, uint check_flags, char **callable_name); ZEND_API zend_bool zend_make_callable(zval *callable, char **callable_name TSRMLS_DC); ZEND_API const char *zend_get_module_version(const char *module_name); |