Merge pull request #1573 from neoascetic/patch-1

Respect LARAVEL_ENV variable
2013-01-06 12:00:43 -08:00 · 2013-01-06 12:00:43 -08:00 · ff7f6f67db
parent 2946274a95 77679a5659
commit ff7f6f67db
1 changed files with 3 additions and 3 deletions
--- a/laravel/core.php
+++ b/laravel/core.php
@ -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());
 	}