cvs: ZendEngine2(PHP_5_2) / zend_builtin_functions.c /tests is_a.phpt php-src NEWS

dmitry Wed Aug 22 13:19:48 2007 UTC Modified files: (Branch: PHP_5_2) /php-src NEWS /ZendEngine2 zend_builtin_functions.c /ZendEngine2/tests is_a.phpt Log: Fixed bug #42009 (is_a() and is_subclass_of() should NOT call autoload, in the same way as "instanceof" operator). http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.902&r2=1.2027.2.547.2.903&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.902 php-src/NEWS:1.2027.2.547.2.903 --- php-src/NEWS:1.2027.2.547.2.902 Tue Aug 21 22:45:52 2007 +++ php-src/NEWS Wed Aug 22 13:19:47 2007 @@ -1,6 +1,8 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? Aug 2007, PHP 5.2.4 +- Fixed bug #42009 (is_a() and is_subclass_of() should NOT call autoload, + in the same way as "instanceof" operator). (Dmitry) - Fixed bug #41904 (proc_open(): empty env array should cause empty environment to be passed to process). (Jani) http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_builtin_functions.c?r1=1.277.2.12.2.23&r2=1.277.2.12.2.24&diff_format=u Index: ZendEngine2/zend_builtin_functions.c diff -u ZendEngine2/zend_builtin_functions.c:1.277.2.12.2.23 ZendEngine2/zend_builtin_functions.c:1.277.2.12.2.24 --- ZendEngine2/zend_builtin_functions.c:1.277.2.12.2.23 Wed Aug 8 13:32:46 2007 +++ ZendEngine2/zend_builtin_functions.c Wed Aug 22 13:19:47 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_builtin_functions.c,v 1.277.2.12.2.23 2007/08/08 13:32:46 dmitry Exp $ */ +/* $Id: zend_builtin_functions.c,v 1.277.2.12.2.24 2007/08/22 13:19:47 dmitry Exp $ */ #include "zend.h" #include "zend_API.h" @@ -660,7 +660,7 @@ convert_to_string_ex(class_name); - if (zend_lookup_class_ex(Z_STRVAL_PP(class_name), Z_STRLEN_PP(class_name), (instance_ce != NULL), &ce TSRMLS_CC) == FAILURE) { + if (zend_lookup_class_ex(Z_STRVAL_PP(class_name), Z_STRLEN_PP(class_name), 0, &ce TSRMLS_CC) == FAILURE) { retval = 0; } else { if (only_subclass) { http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/is_a.phpt?r1=1.2.2.2&r2=1.2.2.2.2.1&diff_format=u Index: ZendEngine2/tests/is_a.phpt diff -u ZendEngine2/tests/is_a.phpt:1.2.2.2 ZendEngine2/tests/is_a.phpt:1.2.2.2.2.1 --- ZendEngine2/tests/is_a.phpt:1.2.2.2 Fri Sep 9 06:48:49 2005 +++ ZendEngine2/tests/is_a.phpt Wed Aug 22 13:19:48 2007 @@ -47,5 +47,4 @@ bool(true) bool(false) AUTOLOAD 'X1' -AUTOLOAD 'X2' bool(false)