diff options
| author | Zeev Suraski <zeev@php.net> | 2003-07-22 13:49:33 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2003-07-22 13:49:33 +0000 |
| commit | 6a50660cfe72ec200377c2537c7ec083f7172eb2 (patch) | |
| tree | c9e206a18a2facb9ee7620e22942a66f3445c59a /Zend/zend_object_handlers.c | |
| parent | ccff4687742d3326e4e00f5dac723c4b24ca3d9d (diff) | |
| download | php-git-6a50660cfe72ec200377c2537c7ec083f7172eb2.tar.gz | |
Fix isset()/empty() for non-trivial object elements
(API change - read_property now accepts an extra element)
Fixes bug #24436
Diffstat (limited to 'Zend/zend_object_handlers.c')
| -rw-r--r-- | Zend/zend_object_handlers.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c index 399f7bfab8..7405377aad 100644 --- a/Zend/zend_object_handlers.c +++ b/Zend/zend_object_handlers.c @@ -238,7 +238,7 @@ static inline zend_property_info *zend_get_property_info(zend_object *zobj, zval } -zval *zend_std_read_property(zval *object, zval *member TSRMLS_DC) +zval *zend_std_read_property(zval *object, zval *member, zend_bool silent TSRMLS_DC) { zend_object *zobj; zval tmp_member; @@ -274,7 +274,9 @@ zval *zend_std_read_property(zval *object, zval *member TSRMLS_DC) retval = &EG(uninitialized_zval_ptr); } } else { - zend_error(E_NOTICE,"Undefined property: %s::$%s", zobj->ce->name, Z_STRVAL_P(member)); + if (!silent) { + zend_error(E_NOTICE,"Undefined property: %s::$%s", zobj->ce->name, Z_STRVAL_P(member)); + } retval = &EG(uninitialized_zval_ptr); } } |