diff options
| author | Dmitry Stogov <dmitry@php.net> | 2007-08-22 13:20:09 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2007-08-22 13:20:09 +0000 |
| commit | 1322b1a30a4b8b294195294aaac326da9156130c (patch) | |
| tree | e14feb127024d5996715cfdc86ea643e22d11143 | |
| parent | 046b878b5bb997db890274f9f1ea804c2106ec80 (diff) | |
| download | php-git-1322b1a30a4b8b294195294aaac326da9156130c.tar.gz | |
Fixed bug #42009 (is_a() and is_subclass_of() should NOT call autoload, in the same way as "instanceof" operator).
| -rwxr-xr-x | Zend/tests/is_a.phpt | 1 | ||||
| -rw-r--r-- | Zend/zend_builtin_functions.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/Zend/tests/is_a.phpt b/Zend/tests/is_a.phpt index dfc0d59b49..f24a6aadb3 100755 --- 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 976c713090..e5e6bdb878 100644 --- 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) { |