diff --git a/laravel/core.php b/laravel/core.php
index 0dcaaca5c07..eb24b9501bb 100644
--- a/laravel/core.php
+++ b/laravel/core.php
@@ -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
 {