From: Scott MacVicar <scottmac@php.net>
Date: Thu, 18 Oct 2007 14:39:08 +0000 (+0000)
Subject: MFB53: Fixed bug #43020 (Warning message is missing with shuffle() and more than... 
X-Git-Tag: php-5.2.5RC1~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3e47b3cb7b2f423e94c55189e452e750aaec4d5e;p=php

MFB53: Fixed bug #43020 (Warning message is missing with shuffle() and more than one argument)
---

diff --git a/NEWS b/NEWS
index 57a84e043b..4702f2a08f 100644
--- a/NEWS
+++ b/NEWS
@@ -33,6 +33,8 @@ PHP                                                                        NEWS
 - Fixed htmlentities/htmlspecialchars not to accept partial multibyte
   sequences. (Stas)
 
+- Fixed bug #43020 (Warning message is missing with shuffle() and more
+  than one argument). (Scott)
 - Fixed bug #42917 (PDO::FETCH_KEY_PAIR doesn't work with setFetchMode).
   (Ilia)
 - Fixed bug #42890 (Constant "LIST" defined by mysqlclient and c-client).
diff --git a/ext/standard/array.c b/ext/standard/array.c
index 30be25a809..4710776648 100644
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -1844,7 +1844,7 @@ PHP_FUNCTION(shuffle)
 {
 	zval *array;
 
-	if (zend_parse_parameters(1 TSRMLS_CC, "a", &array) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a", &array) == FAILURE) {
 		RETURN_FALSE;
 	}