Merge branch 'master' into develop

ganigeorgiev · ganigeorgiev · commit 828900cc80cd · 2019-08-16T18:59:39.000+03:00
diff --git a/behaviors/FileStorageBehavior.php b/behaviors/FileStorageBehavior.php
@@ -317,8 +317,6 @@ public function createThumbs(array $thumbKeys = []): int
             return $sucessCounter;
         }
 
-        ini_set('memory_limit', '128M');
-
         // create an image manager instance with available driver
         $imageManager = new ImageManager([
             'driver' => (extension_loaded('imagick') ? 'imagick' : 'gd'),

Original file line number	Diff line number	Diff line change
`@@ -317,8 +317,6 @@ public function createThumbs(array $thumbKeys = []): int`
`317`	`317`	`return $sucessCounter;`
`318`	`318`	`}`
`319`	`319`
`320`		`- ini_set('memory_limit', '128M');`
`321`		`-`
`322`	`320`	`// create an image manager instance with available driver`
`323`	`321`	`$imageManager = new ImageManager([`
`324`	`322`	`'driver' => (extension_loaded('imagick') ? 'imagick' : 'gd'),`