Fixed bug #42009 (is_a() and is_subclass_of() should NOT call autoload, in the same...

diff --git a/Zend/tests/is_a.phpt b/Zend/tests/is_a.phpt
index dfc0d59b490b32d7985026419f0281f0e5d93863..f24a6aadb30bec7c3bfbc82d9bd95d667e31c4dc 100755 (executable)
--- a/Zend/tests/is_a.phpt
+++ b/Zend/tests/is_a.phpt
@@ -47,5 +47,4 @@ bool(false)
 bool(true)
 bool(false)
 AUTOLOAD 'X1'
-AUTOLOAD 'X2'
 bool(false)

diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
index 976c713090fc08be3cfddafa779f57fc2d83fabc..e5e6bdb878d1e2044dc8cb233971be0805041c6f 100644 (file)
--- a/Zend/zend_builtin_functions.c
+++ b/Zend/zend_builtin_functions.c
@@ -689,7 +689,7 @@ static void is_a_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool only_subclass) /*
 
        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) {