diff --git a/laravel/bootstrap/core.php b/laravel/bootstrap/core.php index ef8fec89..27da5ec0 100644 --- a/laravel/bootstrap/core.php +++ b/laravel/bootstrap/core.php @@ -58,7 +58,6 @@ * request rather than parse the keys for every request. */ Config::load('application'); -Config::load('container'); Config::load('session'); /** diff --git a/laravel/container.php b/laravel/container.php index 18af38cf..d58707d5 100644 --- a/laravel/container.php +++ b/laravel/container.php @@ -16,6 +16,8 @@ class IoC { */ public static function bootstrap() { + Config::load('container'); + static::$container = new Container(Config::$items['container']); } diff --git a/laravel/url.php b/laravel/url.php index 4a82e45e..0eb2120e 100644 --- a/laravel/url.php +++ b/laravel/url.php @@ -90,7 +90,7 @@ public static function to_asset($url, $https = null) */ public static function to_route($name, $parameters = array(), $https = false) { - if ( ! is_null($route = IoC::container()->core('routing.router')->find($name))) + if ( ! is_null($route = IoC::core('routing.router')->find($name))) { $uris = explode(', ', key($route));