From 2c750d7f84556a08148c207388abf2beddb06c90 Mon Sep 17 00:00:00 2001 From: Antony Dovgal Date: Sun, 19 Mar 2006 22:12:39 +0000 Subject: [PATCH] make the code a bit cleaner - no need for two different checks that are doing effectively the same --- ext/standard/array.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ext/standard/array.c b/ext/standard/array.c index 8f887ad45f..af64947fdd 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -4335,12 +4335,10 @@ PHP_FUNCTION(array_filter) php_error_docref(NULL TSRMLS_CC, E_WARNING, "The first argument should be an array"); return; } - if (callback) { - func = *callback; - } array = *input; if (ZEND_NUM_ARGS() > 1) { + func = *callback; if (!zend_is_callable(func, 0, &callback_name)) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "The second argument, '%R', should be a valid callback", Z_TYPE(callback_name), Z_UNIVAL(callback_name)); zval_dtor(&callback_name); -- 2.40.0