]> granicus.if.org Git - php/commitdiff
MFH: make the code cleaner
authorAntony Dovgal <tony2001@php.net>
Sun, 19 Mar 2006 22:11:36 +0000 (22:11 +0000)
committerAntony Dovgal <tony2001@php.net>
Sun, 19 Mar 2006 22:11:36 +0000 (22:11 +0000)
ext/standard/array.c

index dc2f4d88ab06f6165e7b1bed2dab7cd20caac1f0..03f6bfaafd3fcd1a845296d07a9ba4c9ca0016cb 100644 (file)
@@ -4133,12 +4133,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, '%s', should be a valid callback", callback_name);
                        efree(callback_name);