]> granicus.if.org Git - php/commitdiff
- Fix is_callable usage
authorMarcus Boerger <helly@php.net>
Fri, 16 Dec 2005 22:18:11 +0000 (22:18 +0000)
committerMarcus Boerger <helly@php.net>
Fri, 16 Dec 2005 22:18:11 +0000 (22:18 +0000)
ext/standard/basic_functions.c

index 583d7bdbc860c235a1e5ddd3bfb26f874e44bd48..8b26a504e95142c41c028ddafac319bbfbc89108 100644 (file)
@@ -2067,7 +2067,7 @@ PHP_FUNCTION(call_user_func)
                convert_to_string_ex(params[0]);
        }
 
-       if (!zend_is_callable(*params[0], IS_CALLABLE_CHECK_NO_ACCESS, &name)) {
+       if (!zend_is_callable(*params[0], 0, &name)) {
                php_error_docref1(NULL TSRMLS_CC, name, E_WARNING, "First argument is expected to be a valid callback");
                efree(name);
                efree(params);
@@ -2127,7 +2127,7 @@ PHP_FUNCTION(call_user_func_array)
                convert_to_string_ex(func);
        }
 
-       if (!zend_is_callable(*func, IS_CALLABLE_CHECK_NO_ACCESS, &name)) {
+       if (!zend_is_callable(*func, 0, &name)) {
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "First argument is expected to be a valid callback, '%s' was given", name);
                efree(name);
                RETURN_NULL();
@@ -2395,7 +2395,7 @@ PHP_FUNCTION(register_shutdown_function)
        }
        
        /* Prevent entering of anything but valid callback (syntax check only!) */
-       if (!zend_is_callable(shutdown_function_entry.arguments[0], 1, &function_name)) {
+       if (!zend_is_callable(shutdown_function_entry.arguments[0], 0, &function_name)) {
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid shutdown callback '%s' passed", function_name);
                efree(shutdown_function_entry.arguments);
                RETVAL_FALSE;