Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
parent 2946274a95 77679a5659
commit ff7f6f67db
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
laravel/core.php
View File

@ -171,9 +171,9 @@
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 @@
foreach ($bundles as $bundle => $config)
{
Bundle::register($bundle, $config);
}
}