felipe Wed Jul 23 16:28:46 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard array.c
Log:
- MFH: Fixed bug #45605 (array_uintersect_assoc gives incorrect error message)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.308.2.21.2.37.2.35&r2=1.308.2.21.2.37.2.36&diff_format=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.308.2.21.2.37.2.35
php-src/ext/standard/array.c:1.308.2.21.2.37.2.36
--- php-src/ext/standard/array.c:1.308.2.21.2.37.2.35 Wed Jul 9 21:29:52 2008
+++ php-src/ext/standard/array.c Wed Jul 23 16:28:46 2008
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: array.c,v 1.308.2.21.2.37.2.35 2008/07/09 21:29:52 colder Exp $ */
+/* $Id: array.c,v 1.308.2.21.2.37.2.36 2008/07/23 16:28:46 felipe Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -2837,10 +2837,14 @@
/* Get the argument count */
argc = ZEND_NUM_ARGS();
if (data_compare_type == INTERSECT_COMP_DATA_USER) {
- if (argc < 3 || zend_parse_parameters(ZEND_NUM_ARGS()
TSRMLS_CC, "+f", &args, &argc, &BG(user_compare_fci),
&BG(user_compare_fci_cache)) == FAILURE) {
+ if (argc < 3) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "at least 3
parameters are required, %d given", ZEND_NUM_ARGS());
return;
}
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "+f",
&args, &argc, &BG(user_compare_fci), &BG(user_compare_fci_cache)) == FAILURE) {
+ return;
+ }
intersect_data_compare_func = zval_user_compare;
} else {
if (argc < 2 || zend_parse_parameters(ZEND_NUM_ARGS()
TSRMLS_CC, "+", &args, &argc) == FAILURE) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
