Bugfix. #10

overtrue · overtrue · commit ff52a04852e9 · 2017-06-27T15:14:30.000+08:00
diff --git a/src/LaravelUploader/helpers.php b/src/LaravelUploader/helpers.php
@@ -10,9 +10,9 @@
      */
     function uploader_strategy($strategy)
     {
-        return array_merge_recursive_distinct([
+        return array_merge([
             'filters' => [],
-        ], config('uploader.strategies.default'), config('uploader.strategies.'.$strategy));
+        ], array_merge_recursive_distinct(config('uploader.strategies.default', []), config('uploader.strategies.'.$strategy, [])));
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -10,9 +10,9 @@`
`10`	`10`	`*/`
`11`	`11`	`function uploader_strategy($strategy)`
`12`	`12`	`{`
`13`		`- return array_merge_recursive_distinct([`
	`13`	`+ return array_merge([`
`14`	`14`	`'filters' => [],`
`15`		`- ], config('uploader.strategies.default'), config('uploader.strategies.'.$strategy));`
	`15`	`+ ], array_merge_recursive_distinct(config('uploader.strategies.default', []), config('uploader.strategies.'.$strategy, [])));`
`16`	`16`	`}`
`17`	`17`	`}`
`18`	`18`