From 89ea50a58843076b1831a90d8813cf4c51d8fde9 Mon Sep 17 00:00:00 2001 From: Jeroen van Wolffelaar Date: Fri, 5 Oct 2001 20:14:33 +0000 Subject: [PATCH] Fix bug 13567 and don't depend on a boolean int-value to be either 1 or 0 --- ext/standard/array.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/ext/standard/array.c b/ext/standard/array.c index 156511a27e..922f9cf3b9 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -1071,7 +1071,7 @@ static void php_search_array(INTERNAL_FUNCTION_PARAMETERS, int behavior) zend_hash_internal_pointer_reset_ex(target_hash, &pos); while(zend_hash_get_current_data_ex(target_hash, (void **)&entry, &pos) == SUCCESS) { compare_func(&res, *value, *entry TSRMLS_CC); - if (Z_LVAL(res) == 1) { + if (Z_LVAL(res)) { if (behavior==0) { RETURN_TRUE; } else { @@ -1090,11 +1090,7 @@ static void php_search_array(INTERNAL_FUNCTION_PARAMETERS, int behavior) zend_hash_move_forward_ex(target_hash, &pos); } - if (behavior == 0) { - RETURN_FALSE; - } else { - return; - } + RETURN_FALSE; } -- 2.50.1