laravel
diff --git a/‎laravel/core.php
Lines changed: 8 additions & 4 deletions b/‎laravel/core.php
Lines changed: 8 additions & 4 deletions
@@ -148,15 +148,19 @@
 |--------------------------------------------------------------------------
 |
 | Next we're ready to determine the application environment. This may be
-| set either via the command line options, or, if the request is from
-| the web, via the mapping of URIs to environments that lives in
-| the "paths.php" file for the application and is parsed.
+| set either via the command line options or via the mapping of URIs to
+| environments that lives in the "paths.php" file for the application and
+| is parsed. When determining the CLI environment, the "--env" CLI option
+| overrides the mapping in "paths.php".
 |
 */
-
 if (Request::cli())
 {
 	$environment = get_cli_option('env');
+
+	if (! isset($environment)) {
+		$environment = Request::detect_env($environments, gethostname());
+	}
 }
 else
 {
Original file line number	Diff line number	Diff line change
`@@ -148,15 +148,19 @@`
`148`	`148`	`\|--------------------------------------------------------------------------`
`149`	`149`	`\|`
`150`	`150`	`\| Next we're ready to determine the application environment. This may be`
`151`		`-\| set either via the command line options, or, if the request is from`
`152`		`-\| the web, via the mapping of URIs to environments that lives in`
`153`		`-\| the "paths.php" file for the application and is parsed.`
	`151`	`+\| set either via the command line options or via the mapping of URIs to`
	`152`	`+\| environments that lives in the "paths.php" file for the application and`
	`153`	`+\| is parsed. When determining the CLI environment, the "--env" CLI option`
	`154`	`+\| overrides the mapping in "paths.php".`
`154`	`155`	`\|`
`155`	`156`	`*/`
`156`		`-`
`157`	`157`	`if (Request::cli())`
`158`	`158`	`{`
`159`	`159`	`$environment = get_cli_option('env');`
	`160`	`+`
	`161`	`+ if (! isset($environment)) {`
	`162`	`+ $environment = Request::detect_env($environments, gethostname());`
	`163`	`+ }`
`160`	`164`	`}`
`161`	`165`	`else`
`162`	`166`	`{`