diff options
| author | Dmitry Stogov <dmitry@php.net> | 2007-08-08 13:32:46 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2007-08-08 13:32:46 +0000 |
| commit | ef7166481700b670156f9ea80b84a53200ebc698 (patch) | |
| tree | e39b95b7841ad72d2e39e5ba887cf74240a963bb /Zend/zend_builtin_functions.c | |
| parent | 9bd00453598ef6baefc191d644ede998d6d8b504 (diff) | |
| download | php-git-ef7166481700b670156f9ea80b84a53200ebc698.tar.gz | |
Fixed bug #42211 (property_exists() fails to find protected properties from a parent class)
Diffstat (limited to 'Zend/zend_builtin_functions.c')
| -rw-r--r-- | Zend/zend_builtin_functions.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c index 0f4cf86b20..7b036edfff 100644 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@ -979,7 +979,8 @@ ZEND_FUNCTION(property_exists) } zend_unmangle_property_name(property_info->name, property_info->name_length, &class_name, &prop_name); if (!strncmp(class_name, "*", 1)) { - if (instanceof_function(EG(scope), ce TSRMLS_CC)) { + if (instanceof_function(EG(scope), ce TSRMLS_CC) || + (EG(This) && instanceof_function(Z_OBJCE_P(EG(This)), ce TSRMLS_CC))) { RETURN_TRUE; } RETURN_FALSE; |