Merge pull request #1573 from neoascetic/patch-1

Respect LARAVEL_ENV variable

Merge pull request #1573 from neoascetic/patch-1
Respect LARAVEL_ENV variable
ff7f6f67 · Taylor Otwell · 2946274a · 77679a56 · ff7f6f67
Commit ff7f6f67 authored Jan 06, 2013 by Taylor Otwell
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

core.php laravel/core.php +3 -3

No files found.
--- a/laravel/core.php
+++ b/laravel/core.php
@@ -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());
 	}