php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-26 09:12:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Changed default behavior of array_search to match in_array

Browse Source 
(strict was default on, and is now default off)
This commit is contained in:
Jason Greene
2001-02-20 16:44:57 +00:00
parent f9fe688055
commit ffa08fc26e
1 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ext/standard/array.c
View File

@@ -1051,15 +1051,8 @@ static void php_search_array(INTERNAL_FUNCTION_PARAMETERS, int behavior)
HashPosition pos; /* hash iterator */
ulong num_key;
char *string_key;
int (*compare_func)(zval *, zval *, zval *);
if (behavior == 0) {
compare_func = is_equal_function;
} else {
/* Lets not return a key unless the values are exact */
compare_func = is_identical_function;
}
int (*compare_func)(zval *, zval *, zval *) = is_equal_function;
if (ZEND_NUM_ARGS() < 2 || ZEND_NUM_ARGS() > 3 ||
zend_get_parameters_ex(ZEND_NUM_ARGS(), &value, &array, &strict) == FAILURE) {
WRONG_PARAM_COUNT;
@@ -1079,9 +1072,7 @@ static void php_search_array(INTERNAL_FUNCTION_PARAMETERS, int behavior)
convert_to_boolean_ex(strict);
if (Z_LVAL_PP(strict)) {
compare_func = is_identical_function;
} else {
compare_func = is_equal_function;
}
}
}
target_hash = HASH_OF(*array);