Em Qua, 2008-07-23 às 20:11 +0300, Jani Taskinen escreveu: > Did you read my comment in that bug report? >
Yes, but after the commit. > --Jani > > Felipe Pena wrote: > > felipe Wed Jul 23 16:27:16 2008 UTC > > > > Modified files: > > /php-src/ext/standard array.c > > Log: > > - Fixed bug #45605 (array_uintersect_assoc gives incorrect error message) > > (patch by ilewis at uk dot ibm dot com) > > > > > > http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.455&r2=1.456&diff_format=u > > Index: php-src/ext/standard/array.c > > diff -u php-src/ext/standard/array.c:1.455 > > php-src/ext/standard/array.c:1.456 > > --- php-src/ext/standard/array.c:1.455 Wed Jul 9 21:29:39 2008 > > +++ php-src/ext/standard/array.c Wed Jul 23 16:27:16 2008 > > @@ -21,7 +21,7 @@ > > +----------------------------------------------------------------------+ > > */ > > > > -/* $Id: array.c,v 1.455 2008/07/09 21:29:39 colder Exp $ */ > > +/* $Id: array.c,v 1.456 2008/07/23 16:27:16 felipe Exp $ */ > > > > #include "php.h" > > #include "php_ini.h" > > @@ -3061,10 +3061,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) { > > > > > > > -- Regards, Felipe Pena. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
