fixing some issues related to environment.

2012-04-19 14:32:27 -05:00
parent 4440412f57
commit 58f69fdf47
3 changed files with 14 additions and 3 deletions
--- a/laravel/config.php
+++ b/laravel/config.php
@@ -226,9 +226,9 @@ class Config {
 		// Configuration files can be made specific for a given environment. If an
 		// environment has been set, we will merge the environment configuration
 		// in last, so that it overrides all other options.
-		if (isset($_SERVER['LARAVEL_ENV']))
+		if ( ! is_null(Request::env()))
 		{
-			$paths[] = $paths[count($paths) - 1].$_SERVER['LARAVEL_ENV'].'/';
+			$paths[] = $paths[count($paths) - 1].Request::env().'/';
 		}

 		return $paths;