]> granicus.if.org Git - php/commitdiff
- MFH
authorAndi Gutmans <andi@php.net>
Wed, 27 Oct 2004 18:15:53 +0000 (18:15 +0000)
committerAndi Gutmans <andi@php.net>
Wed, 27 Oct 2004 18:15:53 +0000 (18:15 +0000)
Zend/zend_operators.c

index 3890bc13e431899407596472f5336f6c4a3ef3d8..76c21878ec5d89e089c8e24eba4157bab3ed08fa 100644 (file)
@@ -1330,11 +1330,7 @@ ZEND_API int compare_function(zval *result, zval *op1, zval *op2 TSRMLS_DC)
        
        if (op1->type == IS_BOOL || op2->type == IS_BOOL
                || op1->type == IS_NULL || op2->type == IS_NULL) {
-               if (free_op1) {
-                       convert_to_boolean(op1);
-               } else {
-                       zendi_convert_to_boolean(op1, op1_copy, result);
-               }
+               zendi_convert_to_boolean(op1, op1_copy, result);
                zendi_convert_to_boolean(op2, op2_copy, result);
                result->type = IS_LONG;
                result->value.lval = ZEND_NORMALIZE_BOOL(op1->value.lval-op2->value.lval);