Use the + operator instead of array_merge to properly handle numeric …

…keys. Fixes blueimp#2589
asadali3210 · Sep 13, 2013 · 6ba55a8 · 6ba55a8
1 parent b4cc566
commit 6ba55a8
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/server/php/UploadHandler.php b/server/php/UploadHandler.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * jQuery File Upload Plugin PHP Class 6.9.0
+ * jQuery File Upload Plugin PHP Class 6.9.1
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2010, Sebastian Tschan
@@ -125,10 +125,10 @@ function __construct($options = null, $initialize = true, $error_messages = null
             )
         );
         if ($options) {
-            $this->options = array_merge($this->options, $options);
+            $this->options = $options + $this->options;
         }
         if ($error_messages) {
-            $this->error_messages = array_merge($this->error_messages, $error_messages);
+            $this->error_messages = $error_messages + $this->error_messages;
         }
         if ($initialize) {
             $this->initialize();