Merge pull request blueimp#1808 from sieppl/patch-1

Update server/php/upload.class.php

Author: blueimp

server/php/upload.class.php

@@ -107,7 +107,7 @@ function __construct($options = null, $initialize = true) {
             )
         );
         if ($options) {
-            $this->options = array_replace_recursive($this->options, $options);
+            $this->options = array_merge($this->options, $options);
         }
         if ($initialize) {
             $this->initialize();