Skip to content

S
syncEnrollments
Commit ff7f6f67 authored by Taylor Otwell's avatar Taylor Otwell
Browse files
Options

Merge pull request #1573 from neoascetic/patch-1 

Respect LARAVEL_ENV variable
parents 2946274a 77679a56
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
laravel/core.php
View file @ ff7f6f67
...@@ -171,9 +171,9 @@ Request::$foundation = RequestFoundation::createFromGlobals(); ...@@ -171,9 +171,9 @@ Request::$foundation = RequestFoundation::createFromGlobals();
if (Request::cli()) 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()); $environment = Request::detect_env($environments, gethostname());
} }
...@@ -240,4 +240,4 @@ $bundles = require path('app').'bundles'.EXT; ...@@ -240,4 +240,4 @@ $bundles = require path('app').'bundles'.EXT;
foreach ($bundles as $bundle => $config) foreach ($bundles as $bundle => $config)
{ {
Bundle::register($bundle, $config); Bundle::register($bundle, $config);
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment