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

diff --git a/NEWS b/NEWS
index 57a84e043b6d3e1df871e6722770f68bd13b3b67..4702f2a08fb1ff5289cd489b56d1e3f8cb38c84e 100644 (file)
--- 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 30be25a809cacc1e7867f511c86eef9a48db854a..4710776648a12c3cca6be54293ad76ccafdc946c 100644 (file)
--- 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;
        }