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

Merge pull request #313 from kitakira/fix-params-mergeConfigFrom

Browse Source 
Fix params mergeConfigFrom
This commit is contained in:
Oliver Vogel
2015-01-29 09:44:26 +01:00
parent b2b068c496 a8cfea7a85
commit 949d4909d2
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'];