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

diff --git a/NEWS b/NEWS
index 32c11d31e9a23b0e8538a279fb1126570883b433..998e9ee3bc8dbe59fbdc690493f8cfab86e17965 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -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)
 

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 7b036edfffa77f5d3c2debadecfb0b3c994492b5..88b14f4b2e40c0d15c4f0c228db9a8c81def9d5f 100644 (file)
--- a/Zend/zend_builtin_functions.c
+++ b/Zend/zend_builtin_functions.c
@@ -660,7 +660,7 @@ static void is_a_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool only_subclass)
 
        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) {