summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelipe Pena <felipe@php.net>2010-03-07 00:49:34 +0000
committerFelipe Pena <felipe@php.net>2010-03-07 00:49:34 +0000
commitea1447c3ce5f6f6895143aa93e2b0c7dfa3e5618 (patch)
treef72b3c86543ef71367998d20d629b4e3b28e01fc
parent03bec4299f4eaa53bf4e389996ddb2404ba82be7 (diff)
downloadphp-git-ea1447c3ce5f6f6895143aa93e2b0c7dfa3e5618.tar.gz
- Fixed bug #50810 (property_exists does not work for private)
-rw-r--r--NEWS1
-rw-r--r--Zend/zend_builtin_functions.c6
2 files changed, 3 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index a61e55218e..103d5d9277 100644
--- a/NEWS
+++ b/NEWS
@@ -19,6 +19,7 @@ PHP NEWS
- Fixed bug #51023 (filter doesn't detect int overflows with GCC 4.4).
(Raphael Geissert)
- Fixed bug #50999 (unaligned memory access in dba_fetch()). (Felipe)
+- Fixed bug #50810 (property_exists does not work for private). (Felipe)
- Fixed bug #50731 (Inconsistent namespaces sent to functions registered with
spl_autoload_register). (Felipe)
- Fixed bug #50358 (Compile failure compiling ext/phar/util.lo). (Felipe)
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
index a001c6c7e5..4c96e19975 100644
--- a/Zend/zend_builtin_functions.c
+++ b/Zend/zend_builtin_functions.c
@@ -1151,10 +1151,8 @@ ZEND_FUNCTION(property_exists)
}
h = zend_get_hash_value(property, property_len+1);
- if (zend_hash_quick_find(&ce->properties_info, property, property_len+1, h, (void **) &property_info) == SUCCESS) {
- if (property_info->flags & ZEND_ACC_SHADOW) {
- RETURN_FALSE;
- }
+ if (zend_hash_quick_find(&ce->properties_info, property, property_len+1, h, (void **) &property_info) == SUCCESS
+ && (property_info->flags & ZEND_ACC_SHADOW) == 0) {
RETURN_TRUE;
}