Re: [ZEND-ENGINE-CVS] cvs: ZendEngine2(PHP_5_3) / zend_API.c

Hello Rasmus,

Saturday, February 2, 2008, 12:09:10 AM, you wrote:

> rasmus          Fri Feb  1 23:09:10 2008 UTC

>   Modified files:              (Branch: PHP_5_3)
>     /ZendEngine2        zend_API.c 
>   Log:
>   Small tweak.  Need to make array and string callback syntax behave the 
>   same way.  Also change "cannot" to "should not" since we obviously
>   "can" make the call.
>   
>   
> http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_API.c?r1=1.296.2.27.2.34.2.18&r2=1.296.2.27.2.34.2.19&diff_format=u
> Index: ZendEngine2/zend_API.c
> diff -u ZendEngine2/zend_API.c:1.296.2.27.2.34.2.18
> ZendEngine2/zend_API.c:1.296.2.27.2.34.2.19
> --- ZendEngine2/zend_API.c:1.296.2.27.2.34.2.18 Fri Feb  1 21:27:55 2008
> +++ ZendEngine2/zend_API.c      Fri Feb  1 23:09:10 2008
> @@ -2478,7 +2478,7 @@
>                                 return 1;
>                         }
>  
> -                       return
> zend_is_callable_check_func(check_flags|IS_CALLABLE_CHECK_IS_STATIC,
> zobj_ptr_ptr, NULL, callable, ce_ptr, fptr_ptr, error TSRMLS_CC);
> +                       return zend_is_callable_check_func(check_flags,
> zobj_ptr_ptr, NULL, callable, ce_ptr,
> fptr_ptr, error TSRMLS_CC);
>  
>                 case IS_ARRAY:
>                         {

Good catch, this is actually a left over from the merge from head.

Best regards,
 Marcus