iliaa Mon Nov 5 23:53:23 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard array.c
Log:
Fixed bug #43197 (array_intersect_assoc() does not emit warning messages for
error inputs)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.308.2.21.2.37.2.6&r2=1.308.2.21.2.37.2.7&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.6
php-src/ext/standard/array.c:1.308.2.21.2.37.2.7
--- php-src/ext/standard/array.c:1.308.2.21.2.37.2.6 Fri Nov 2 19:40:38 2007
+++ php-src/ext/standard/array.c Mon Nov 5 23:53:23 2007
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: array.c,v 1.308.2.21.2.37.2.6 2007/11/02 19:40:38 jani Exp $ */
+/* $Id: array.c,v 1.308.2.21.2.37.2.7 2007/11/05 23:53:23 iliaa Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -2749,11 +2749,13 @@
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) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "at least 3
parameters are required, %d given", ZEND_NUM_ARGS());
return;
}
intersect_data_compare_func = zval_user_compare;
} else {
if (argc < 2 || zend_parse_parameters(ZEND_NUM_ARGS()
TSRMLS_CC, "+", &args, &argc) == FAILURE) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "at least 2
parameters are required, %d given", ZEND_NUM_ARGS());
return;
}
if (data_compare_type == INTERSECT_COMP_DATA_INTERNAL) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
