cvs: ZendEngine2(PHP_5_0) / zend_operators.c

andi            Wed Oct 27 14:15:54 2004 EDT

  Modified files:              (Branch: PHP_5_0)
    /ZendEngine2        zend_operators.c 
  Log:
  - MFH
  
  
http://cvs.php.net/diff.php/ZendEngine2/zend_operators.c?r1=1.193.2.5&r2=1.193.2.6&ty=u
Index: ZendEngine2/zend_operators.c
diff -u ZendEngine2/zend_operators.c:1.193.2.5 
ZendEngine2/zend_operators.c:1.193.2.6
--- ZendEngine2/zend_operators.c:1.193.2.5      Tue Oct 26 18:40:51 2004
+++ ZendEngine2/zend_operators.c        Wed Oct 27 14:15:53 2004
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_operators.c,v 1.193.2.5 2004/10/26 22:40:51 iliaa Exp $ */
+/* $Id: zend_operators.c,v 1.193.2.6 2004/10/27 18:15:53 andi Exp $ */
 
 #include <ctype.h>
 
@@ -1330,11 +1330,7 @@
        
        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);

-- 
Zend Engine CVS Mailing List (http://cvs.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php