Unicode support in is_callable().

diff --git a/ext/standard/type.c b/ext/standard/type.c
index 85f283f93ff6663952c90840b640772dfccb2fe2..b90ecdfe51425cc9fc6487ca9af9fbb9c5d1643f 100644 (file)
--- a/ext/standard/type.c
+++ b/ext/standard/type.c
@@ -441,31 +441,25 @@ PHP_FUNCTION(is_scalar)
 }
 /* }}} */
 
-/* {{{ proto bool is_callable(mixed var [, bool syntax_only [, string callable_name]]) 
+/* {{{ proto bool is_callable(mixed var [, bool syntax_only [, string callable_name]])  U
    Returns true if var is callable. */
 PHP_FUNCTION(is_callable)
 {
-       zval **var, **syntax_only, **callable_name;
+       zval *var, **callable_name;
        zval name;
        zend_bool retval;
-       zend_bool syntax = 0;
-       int argc=ZEND_NUM_ARGS();
+       zend_bool syntax_only = 0;
 
-       if (argc < 1 || argc > 3 || zend_get_parameters_ex(argc, &var, &syntax_only, &callable_name) == FAILURE) {
-               WRONG_PARAM_COUNT;
-       }
-
-       if (argc > 1) {
-               convert_to_boolean_ex(syntax_only);
-               syntax = Z_BVAL_PP(syntax_only);
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|bZ", &var,
+                                                         &syntax_only, &callable_name) == FAILURE) {
+               return;
        }
 
-       if (argc > 2) {
-               retval = zend_is_callable(*var, syntax, &name);
-               zval_dtor(*callable_name);
-               **callable_name = name;
+       if (ZEND_NUM_ARGS() > 2) {
+               retval = zend_is_callable(var, syntax_only, &name);
+               REPLACE_ZVAL_VALUE(callable_name, &name, 0);
        } else {
-               retval = zend_is_callable(*var, syntax, NULL);
+               retval = zend_is_callable(var, syntax_only, NULL);
        }
 
        RETURN_BOOL(retval);