Merge pull request #1573 from neoascetic/patch-1

Respect LARAVEL_ENV variable
This commit is contained in:
Taylor Otwell
2013-01-06 12:00:43 -08:00

View File

@@ -171,9 +171,9 @@ Request::$foundation = RequestFoundation::createFromGlobals();
if (Request::cli())
{
$environment = get_cli_option('env');
$environment = get_cli_option('env', getenv('LARAVEL_ENV'));
if ( ! isset($environment))
if (empty($environment))
{
$environment = Request::detect_env($environments, gethostname());
}
@@ -240,4 +240,4 @@ $bundles = require path('app').'bundles'.EXT;
foreach ($bundles as $bundle => $config)
{
Bundle::register($bundle, $config);
}
}