diff options
| author | Andrey Hristov <andrey@php.net> | 2012-10-17 17:23:37 +0200 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2012-10-17 17:23:37 +0200 |
| commit | 7314ed535f93841ff2d2bca5e65afcb0f2b003bb (patch) | |
| tree | bceec620f2cb1d5f255196e00ae7ea1187b41fe2 /Zend/zend_operators.c | |
| parent | c50d732f7686352381d44926988aca194204433d (diff) | |
| parent | da541ff561e0ac6ac72d2efd8b785ecfeef868dc (diff) | |
| download | php-git-7314ed535f93841ff2d2bca5e65afcb0f2b003bb.tar.gz | |
Merge branch 'PHP-5.3' of ssh://git.php.net/php-src into PHP-5.3
Diffstat (limited to 'Zend/zend_operators.c')
| -rw-r--r-- | Zend/zend_operators.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index e6fe67e764..aea63faedd 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -1489,6 +1489,9 @@ ZEND_API int compare_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) /* { ret = compare_function(result, op1, op_free TSRMLS_CC); zend_free_obj_get_result(op_free TSRMLS_CC); return ret; + } else if (Z_TYPE_P(op1) == IS_OBJECT) { + ZVAL_LONG(result, 1); + return SUCCESS; } } if (!converted) { |