helly Fri Dec 16 22:18:11 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/standard basic_functions.c
Log:
- Fix is_callable usage
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.14&r2=1.725.2.15&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.725.2.14
php-src/ext/standard/basic_functions.c:1.725.2.15
--- php-src/ext/standard/basic_functions.c:1.725.2.14 Fri Dec 16 20:09:16 2005
+++ php-src/ext/standard/basic_functions.c Fri Dec 16 22:18:11 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.725.2.14 2005/12/16 20:09:16 tony2001 Exp $ */
+/* $Id: basic_functions.c,v 1.725.2.15 2005/12/16 22:18:11 helly Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -2067,7 +2067,7 @@
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 @@
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 @@
}
/* 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;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
