diff options
| author | Dmitry Stogov <dmitry@php.net> | 2008-07-26 13:14:56 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2008-07-26 13:14:56 +0000 |
| commit | bdf7981e28a64392908e275d4d3398f8f2028162 (patch) | |
| tree | 64fed56befc4a98f6e9ff0c8244ff3d3036f622f /ext/spl/php_spl.c | |
| parent | a3f0f90dfd11f0f28fac5c6bf3d8849bbe6dbe8a (diff) | |
| download | php-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 'ext/spl/php_spl.c')
| -rwxr-xr-x | ext/spl/php_spl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/spl/php_spl.c b/ext/spl/php_spl.c index ebacf6db68..f8fa3a5a60 100755 --- a/ext/spl/php_spl.c +++ b/ext/spl/php_spl.c @@ -453,7 +453,7 @@ PHP_FUNCTION(spl_autoload_register) zval_dtor(&ztmp); } - if (!zend_is_callable_ex(zcallable, IS_CALLABLE_STRICT, &zfunc_name, &fcc, &error TSRMLS_CC)) { + if (!zend_is_callable_ex(zcallable, NULL, IS_CALLABLE_STRICT, &zfunc_name, &fcc, &error TSRMLS_CC)) { alfi.ce = fcc.calling_scope; alfi.func_ptr = fcc.function_handler; obj_ptr = fcc.object_pp; @@ -583,7 +583,7 @@ PHP_FUNCTION(spl_autoload_unregister) return; } - if (!zend_is_callable_ex(zcallable, IS_CALLABLE_CHECK_SYNTAX_ONLY, &zfunc_name, &fcc, &error TSRMLS_CC)) { + if (!zend_is_callable_ex(zcallable, NULL, IS_CALLABLE_CHECK_SYNTAX_ONLY, &zfunc_name, &fcc, &error TSRMLS_CC)) { zend_throw_exception_ex(spl_ce_LogicException, 0 TSRMLS_CC, "Unable to unregister invalid function (%s)", error); if (error) { efree(error); |