helly Thu Nov 3 17:06:31 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/spl php_spl.c
Log:
- MFH Add missing check flag
http://cvs.php.net/diff.php/php-src/ext/spl/php_spl.c?r1=1.52.2.13&r2=1.52.2.14&ty=u
Index: php-src/ext/spl/php_spl.c
diff -u php-src/ext/spl/php_spl.c:1.52.2.13 php-src/ext/spl/php_spl.c:1.52.2.14
--- php-src/ext/spl/php_spl.c:1.52.2.13 Thu Nov 3 16:59:13 2005
+++ php-src/ext/spl/php_spl.c Thu Nov 3 17:06:30 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_spl.c,v 1.52.2.13 2005/11/03 21:59:13 helly Exp $ */
+/* $Id: php_spl.c,v 1.52.2.14 2005/11/03 22:06:30 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -402,7 +402,7 @@
}
}
- if (!zend_is_callable_ex(zcallable, 0, &func_name,
&func_name_len, &alfi.ce, &alfi.func_ptr, &obj_ptr TSRMLS_CC)) {
+ if (!zend_is_callable_ex(zcallable,
IS_CALLABLE_CHECK_IS_STATIC, &func_name, &func_name_len, &alfi.ce,
&alfi.func_ptr, &obj_ptr TSRMLS_CC)) {
if (Z_TYPE_P(zcallable) == IS_ARRAY) {
if (!obj_ptr && alfi.func_ptr &&
!(alfi.func_ptr->common.fn_flags & ZEND_ACC_STATIC)) {
if (do_throw) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
