Array merge fix in Image.php.

florinpopescu · florinpopescu · commit 8c1c191a3a8a · 2017-02-28T15:55:22.000+02:00
diff --git a/editor-php-sdk-example b/editor-php-sdk-example
@@ -0,0 +1 @@
+Subproject commit 337c5e61489e68779e805e2dc0759b2d567b7b88
diff --git a/lib/FroalaEditor/Image.php b/lib/FroalaEditor/Image.php
@@ -31,7 +31,7 @@ public static function upload($fileRoute, $options = NULL) {
     if (is_null($options)) {
       $options = Image::$defaultUploadOptions;
     } else {
-      $options = array_merge(Image::$defaultUploadOptions, $options);
+      $options = array_merge_recursive(Image::$defaultUploadOptions, $options);
     }
 
     // Upload image.

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Subproject commit 337c5e61489e68779e805e2dc0759b2d567b7b88`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public static function upload($fileRoute, $options = NULL) {`
`31`	`31`	`if (is_null($options)) {`
`32`	`32`	`$options = Image::$defaultUploadOptions;`
`33`	`33`	`} else {`
`34`		`- $options = array_merge(Image::$defaultUploadOptions, $options);`
	`34`	`+ $options = array_merge_recursive(Image::$defaultUploadOptions, $options);`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`// Upload image.`