Fixed bug #55475 (is_a() triggers autoloader). (alan at akbkhome dot com)

diff --git a/NEWS b/NEWS
index 27a3f53f29a71b094217b71524015c0b8f42b969..bdef8d319f2c7b7d485e31fabc763a6a728f775f 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,19 +3,20 @@ PHP                                                                        NEWS
 ?? ??? 2011, PHP 5.3.9
 
 - Core:
-  . Fixed Bug #55649 (Undefined function Bug()). (Laruence)
+  . Fixed bug #55649 (Undefined function Bug()). (Laruence)
   . Fixed bug #55576: Cannot conditionally move uploaded file without race
     condition. (Gustavo)
-  . Fixed bug #55366: keys lost when using substr_replace an array. (Arpad)
-  . Fixed bug #55273 (base64_decode() with strict rejects whitespace after
-    pad). (Ilia)
   . Fixed bug #55510: $_FILES 'name' missing first character after upload.
     (Arpad)
   . Fixed bug #55509 (segfault on x86_64 using more than 2G memory). (Laruence)
   . Fixed bug #55504 (Content-Type header is not parsed correctly on
     HTTP POST request). (Hannes)
+  . Fixed bug #55475 (is_a() triggers autoloader). (alan at akbkhome dot com)
   . Fixed bug #52461 (Incomplete doctype and missing xmlns). 
     (virsacer at web dot de, Pierre)
+  . Fixed bug #55366: keys lost when using substr_replace an array. (Arpad)
+  . Fixed bug #55273 (base64_decode() with strict rejects whitespace after
+    pad). (Ilia)
 
 - Curl:
   . Fixed bug #54798 (Segfault when CURLOPT_STDERR file pointer is closed

diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
index fc094a5e5f173f30a9f78475a5aa3cba9e434d3f..3a2430aeca53016b0c50c23afa126d55081ed806 100644 (file)
--- a/Zend/zend_builtin_functions.c
+++ b/Zend/zend_builtin_functions.c
@@ -822,7 +822,7 @@ static void is_a_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool only_subclass)
                return;
        }
        
-       if (Z_TYPE_P(obj) == IS_STRING) {
+       if (only_subclass && Z_TYPE_P(obj) == IS_STRING) {
                zend_class_entry **the_ce;
                if (zend_lookup_class(Z_STRVAL_P(obj), Z_STRLEN_P(obj), &the_ce TSRMLS_CC) == FAILURE) {
                        RETURN_FALSE;