Update server/php/upload.class.php

sieppl · sieppl · commit 58161d234158 · 2012-10-25T19:06:53.000+03:00
Changing options merge to array_merge in order to have full control when passing options array. blueimp#1807
diff --git a/server/php/upload.class.php b/server/php/upload.class.php
@@ -91,7 +91,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();

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ function __construct($options = null, $initialize = true) {`
`91`	`91`	`)`
`92`	`92`	`);`
`93`	`93`	`if ($options) {`
`94`		`- $this->options = array_replace_recursive($this->options, $options);`
	`94`	`+ $this->options = array_merge($this->options, $options);`
`95`	`95`	`}`
`96`	`96`	`if ($initialize) {`
`97`	`97`	`$this->initialize();`