diff options
| author | Derick Rethans <github@derickrethans.nl> | 2012-10-04 08:39:34 +0100 |
|---|---|---|
| committer | Derick Rethans <github@derickrethans.nl> | 2012-10-04 08:39:34 +0100 |
| commit | b004a04f0aaf041e5fabaf788eee3e9ee0f3afaf (patch) | |
| tree | f3b3dd22329eb6f2b258145a92722becb9ee6b8d /Zend/zend_operators.c | |
| parent | 78354f30d99ebc7f1035c567b9b00e967d87ecc8 (diff) | |
| parent | 64c09f68ec66061d1085ad5a5ef0a5ced63450b6 (diff) | |
| download | php-git-b004a04f0aaf041e5fabaf788eee3e9ee0f3afaf.tar.gz | |
Merge branch 'PHP-5.3' of 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) { |