From ad07803d23e9f4359779ff54ba2c95e57f4cb3b3 Mon Sep 17 00:00:00 2001
From: Christopher Jones <sixd@php.net>
Date: Fri, 15 May 2009 16:46:22 +0000
Subject: [PATCH] MFH: New array_multisort() test and code comment fix (Simon
 Westcott)

---
 ext/standard/array.c                          |  2 +-
 .../array/array_multisort_variation11.phpt    | 21 +++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 ext/standard/tests/array/array_multisort_variation11.phpt

diff --git a/ext/standard/array.c b/ext/standard/array.c
index 46134d5060..d39c0e6bea 100644
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -3789,7 +3789,7 @@ PHP_FUNCTION(array_multisort)
 		}
 	}
 
-	/* If all arrays are empty or have only one entry, we don't need to do anything. */
+	/* If all arrays are empty we don't need to do anything. */
 	if (array_size < 1) {
 		for (k = 0; k < MULTISORT_LAST; k++) {
 			efree(ARRAYG(multisort_flags)[k]);
diff --git a/ext/standard/tests/array/array_multisort_variation11.phpt b/ext/standard/tests/array/array_multisort_variation11.phpt
new file mode 100644
index 0000000000..520dd3d51a
--- /dev/null
+++ b/ext/standard/tests/array/array_multisort_variation11.phpt
@@ -0,0 +1,21 @@
+--TEST--
+Test array_multisort() function : usage variation - testing with empty array
+--FILE--
+<?php
+/* Prototype  : bool array_multisort(array ar1 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING]] [, array ar2 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING]], ...])
+ * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL
+ * Source code: ext/standard/array.c
+ * Alias to functions:
+ */
+
+echo "*** Testing array_multisort() : Testing with empty array ***\n";
+
+var_dump(array_multisort(array()));
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECTF--
+*** Testing array_multisort() : Testing with empty array ***
+bool(true)
+===DONE===
-- 
2.50.1