diff options
| author | Xinchen Hui <laruence@php.net> | 2012-08-31 11:25:21 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2012-08-31 11:25:21 +0800 |
| commit | b5d2c3174fcd3785d827ee310669189e827ca7ec (patch) | |
| tree | e81eddfb7bad5064330b6f9091b6cbd45808ac45 /Zend/zend_operators.c | |
| parent | 5e51209785ea922df7f2be62a5da33fccdf9014a (diff) | |
| parent | 66fad45724214c21491daa21031ac6e5a59d5e3a (diff) | |
| download | php-git-b5d2c3174fcd3785d827ee310669189e827ca7ec.tar.gz | |
Merge branch 'PHP-5.4'
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 93dca94f2b..cf3a908ade 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -1556,6 +1556,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) { |