diff options
| author | Marcus Boerger <helly@php.net> | 2005-04-17 20:16:14 +0000 |
|---|---|---|
| committer | Marcus Boerger <helly@php.net> | 2005-04-17 20:16:14 +0000 |
| commit | 7aad424332a4c9edcfc5f16d937eb656e650b3f0 (patch) | |
| tree | 3a69a1f4f755c8f9abf9344fe5b0583407ec1c1b /Zend/zend_builtin_functions.c | |
| parent | 79b9084eef2085a190756af8800c2abb84c68b84 (diff) | |
| download | php-git-7aad424332a4c9edcfc5f16d937eb656e650b3f0.tar.gz | |
- Fix special cases of property_exists()
Diffstat (limited to 'Zend/zend_builtin_functions.c')
| -rw-r--r-- | Zend/zend_builtin_functions.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c index 3d70c37474..e7dc0533a8 100644 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@ -916,6 +916,8 @@ ZEND_FUNCTION(property_exists) } if (zend_lookup_class(Z_STRVAL_PP(object), Z_STRLEN_PP(object), &pce TSRMLS_CC) == SUCCESS) { ce = *pce; + } else { + RETURN_FALSE; } if (!ce) { RETURN_NULL(); @@ -942,7 +944,7 @@ ZEND_FUNCTION(property_exists) RETURN_FALSE; case IS_OBJECT: - if (Z_OBJ_HANDLER_PP(object, has_property) && Z_OBJ_HANDLER_PP(object, has_property)(*object, *property, 1 TSRMLS_CC)) { + if (Z_OBJ_HANDLER_PP(object, has_property) && Z_OBJ_HANDLER_PP(object, has_property)(*object, *property, 0 TSRMLS_CC)) { RETURN_TRUE; } RETURN_FALSE; |