summaryrefslogtreecommitdiff
path: root/Zend/zend_API.h
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@php.net>2008-07-26 13:14:56 +0000
committerDmitry Stogov <dmitry@php.net>2008-07-26 13:14:56 +0000
commitbdf7981e28a64392908e275d4d3398f8f2028162 (patch)
tree64fed56befc4a98f6e9ff0c8244ff3d3036f622f /Zend/zend_API.h
parenta3f0f90dfd11f0f28fac5c6bf3d8849bbe6dbe8a (diff)
downloadphp-git-bdf7981e28a64392908e275d4d3398f8f2028162.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.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/Zend/zend_API.h b/Zend/zend_API.h
index 1403b9fa65..df6b1198b7 100644
--- a/Zend/zend_API.h
+++ b/Zend/zend_API.h
@@ -280,10 +280,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, zval *callable_name, 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, zval *callable_name, zend_fcall_info_cache *fcc, char **error TSRMLS_DC);
ZEND_API zend_bool zend_is_callable(zval *callable, uint check_flags, zval *callable_name);
ZEND_API zend_bool zend_make_callable(zval *callable, zval *callable_name TSRMLS_DC);
ZEND_API const char *zend_get_module_version(const char *module_name);