summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDerick Rethans <derick@php.net>2002-06-29 15:39:41 +0000
committerDerick Rethans <derick@php.net>2002-06-29 15:39:41 +0000
commit1bf9b3d736b9da06fe453529bf7ce43d06276e70 (patch)
tree04de5750ee024be89c36862f9a793a3abed339cd
parent5f2fcdd689b7763784468e06fb8f44d798df8657 (diff)
downloadphp-git-1bf9b3d736b9da06fe453529bf7ce43d06276e70.tar.gz
- Fix for bug #17654
-rw-r--r--ext/standard/array.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/array.c b/ext/standard/array.c
index 4c7eb7df79..9c8a067732 100644
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -1979,7 +1979,7 @@ static void php_array_merge_wrapper(INTERNAL_FUNCTION_PARAMETERS, int recursive)
/* Get the argument count and check it */
argc = ZEND_NUM_ARGS();
- if (argc < 2) {
+ if (argc < 1) {
WRONG_PARAM_COUNT;
}