Skip to content

Commit

Permalink
Use array_merge() instead ArrayHelper::merge() to merge default thumb…
Browse files Browse the repository at this point in the history
… and preview configs with custom
  • Loading branch information
itstructure committed Jul 22, 2020
1 parent 20d190f commit 73cca6a
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ Addition module description you can see in my [Personal site](https://pack-devel

Via composer:

`composer require itstructure/yii2-multi-format-uploader ~3.0.1`
`composer require itstructure/yii2-multi-format-uploader ~3.0.2`

### If you are testing this package from local server directory

Expand Down
3 changes: 3 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
### CHANGE LOG:

**3.0.2 July 22, 2020:**
- Use `array_merge()` instead `ArrayHelper::merge()` to merge default **thumb** and **preview** configs with custom.

**3.0.1 July 17, 2020:**
- Bug fix for `registerTranslations()` method. Set it static.

Expand Down
6 changes: 3 additions & 3 deletions src/Module.php
Original file line number Diff line number Diff line change
Expand Up @@ -193,17 +193,17 @@ public function init()

self::registerTranslations();

$this->previewOptions = ArrayHelper::merge(
$this->previewOptions = array_merge(
require __DIR__ . '/config/preview-options.php',
$this->previewOptions
);

$this->thumbStubUrls = ArrayHelper::merge(
$this->thumbStubUrls = array_merge(
require __DIR__ . '/config/thumb-stub-urls.php',
$this->thumbStubUrls
);

$this->thumbsConfig = ArrayHelper::merge(
$this->thumbsConfig = array_merge(
require __DIR__ . '/config/thumbs-config.php',
$this->thumbsConfig
);
Expand Down

0 comments on commit 73cca6a

Please sign in to comment.