tony2001 Sun Mar 19 22:11:37 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/ext/standard array.c
Log:
MFH: make the code cleaner
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/array.c?r1=1.308.2.18&r2=1.308.2.19&diff_format=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.308.2.18
php-src/ext/standard/array.c:1.308.2.19
--- php-src/ext/standard/array.c:1.308.2.18 Sun Feb 26 10:49:50 2006
+++ php-src/ext/standard/array.c Sun Mar 19 22:11:36 2006
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: array.c,v 1.308.2.18 2006/02/26 10:49:50 helly Exp $ */
+/* $Id: array.c,v 1.308.2.19 2006/03/19 22:11:36 tony2001 Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -4133,12 +4133,10 @@
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);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
