mirror/intervention_image
1
0
Fork 0
mirror of https://github.com/Intervention/image.git synced 2025-08-30 01:00:06 +02:00
Code Issues Releases Wiki Activity

Fix params mergeConfigFrom

Browse Source
This commit is contained in:
Adnan Tawaffani
2015-01-29 14:47:11 +07:00
parent b2b068c496
commit a8cfea7a85
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Intervention/Image/ImageServiceProviderLaravel5.php
View File

@@ -43,8 +43,8 @@ class ImageServiceProviderLaravel5 extends ServiceProvider
// merge default config // merge default config
$this->mergeConfigFrom( $this->mergeConfigFrom(
'image', __DIR__.'/../../config/config.php',
__DIR__.'/../../config/config.php' 'image'
); );
// create image // create image
@@ -69,8 +69,8 @@ class ImageServiceProviderLaravel5 extends ServiceProvider
// merge default config // merge default config
$this->mergeConfigFrom( $this->mergeConfigFrom(
'imagecache', $config,
$config 'imagecache'
); );
$config = $app['config']; $config = $app['config'];