Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-02-06 23:00:24 +01:00
Code Issues Packages Projects Releases Activity

Merge pull request #511 from getgrav/feature/fix-multisite-subfolder

Browse Source 
Make $container available in setup.php
This commit is contained in:
Flavio Copes
2015-12-09 17:25:31 +01:00
parent 9c6f243902 fab66cf3a5
commit 8fb4063cf2
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
system/src/Grav/Common/Config/Setup.php
View File

@@ -113,8 +113,13 @@ class Setup extends Data
],
];
public function __construct($environment = 'localhost')
public function __construct($container)
{
$environment = $container['uri']->environment();
if (!$environment) {
$environment = 'localhost';
}
// Pre-load setup.php which contains our initial configuration.
// Configuration may contain dynamic parts, which is why we need to always load it.
$file = GRAV_ROOT . '/setup.php';

2
system/src/Grav/Common/Service/ConfigServiceProvider.php
View File

@@ -40,7 +40,7 @@ class ConfigServiceProvider implements ServiceProviderInterface
public static function setup(Container $container)
{
return new Setup($container['uri']->environment());
return new Setup($container);
}
public static function blueprints(Container $container)