Merge pull request laravel#1573 from neoascetic/patch-1

taylorotwell · taylorotwell · commit ff7f6f67db25 · 2013-01-06T12:00:43.000-08:00
Respect LARAVEL_ENV variable
diff --git 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());
 	}
@@ -240,4 +240,4 @@
 foreach ($bundles as $bundle => $config)
 {
 	Bundle::register($bundle, $config);
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -171,9 +171,9 @@`
`171`	`171`
`172`	`172`	`if (Request::cli())`
`173`	`173`	`{`
`174`		`- $environment = get_cli_option('env');`
	`174`	`+ $environment = get_cli_option('env', getenv('LARAVEL_ENV'));`
`175`	`175`
`176`		`- if ( ! isset($environment))`
	`176`	`+ if (empty($environment))`
`177`	`177`	`{`
`178`	`178`	`$environment = Request::detect_env($environments, gethostname());`
`179`	`179`	`}`
`@@ -240,4 +240,4 @@`
`240`	`240`	`foreach ($bundles as $bundle => $config)`
`241`	`241`	`{`
`242`	`242`	`Bundle::register($bundle, $config);`
`243`		`-}`
	`243`	`+}`