cvs: ZendEngine2 / zend_builtin_functions.c /tests is_a.phpt

dmitry Wed Aug 22 13:20:09 2007 UTC Modified files: /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/ZendEngine2/zend_builtin_functions.c?r1=1.347&r2=1.348&diff_format=u Index: ZendEngine2/zend_builtin_functions.c diff -u ZendEngine2/zend_builtin_functions.c:1.347 ZendEngine2/zend_builtin_functions.c:1.348 --- ZendEngine2/zend_builtin_functions.c:1.347 Wed Aug 8 13:32:58 2007 +++ ZendEngine2/zend_builtin_functions.c Wed Aug 22 13:20:09 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_builtin_functions.c,v 1.347 2007/08/08 13:32:58 dmitry Exp $ */ +/* $Id: zend_builtin_functions.c,v 1.348 2007/08/22 13:20:09 dmitry Exp $ */ #include "zend.h" #include "zend_API.h" @@ -689,7 +689,7 @@ convert_to_text_ex(class_name); - if (zend_u_lookup_class_ex(Z_TYPE_PP(class_name), Z_UNIVAL_PP(class_name), Z_UNILEN_PP(class_name), (instance_ce != NULL) ? 1 : 0, 1, &ce TSRMLS_CC) == FAILURE) { + if (zend_u_lookup_class_ex(Z_TYPE_PP(class_name), Z_UNIVAL_PP(class_name), Z_UNILEN_PP(class_name), 0, 1, &ce TSRMLS_CC) == FAILURE) { retval = 0; } else { if (only_subclass) { http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/is_a.phpt?r1=1.2&r2=1.3&diff_format=u Index: ZendEngine2/tests/is_a.phpt diff -u ZendEngine2/tests/is_a.phpt:1.2 ZendEngine2/tests/is_a.phpt:1.3 --- ZendEngine2/tests/is_a.phpt:1.2 Fri Sep 9 06:47:18 2005 +++ ZendEngine2/tests/is_a.phpt Wed Aug 22 13:20:09 2007 @@ -47,5 +47,4 @@ bool(true) bool(false) AUTOLOAD 'X1' -AUTOLOAD 'X2' bool(false)