Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixing some issues related to environment.

This commit is contained in:
Taylor Otwell 2012-04-19 14:32:27 -05:00
parent 4440412f57
commit 58f69fdf47
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
laravel/config.php
View File

@ -226,9 +226,9 @@ protected static function paths($bundle)
// 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;

2
laravel/core.php
View File

@ -187,7 +187,7 @@
if ( ! is_null($environment))
{
Request::foundation()->server->set('LARAVEL_ENV', $environment);
Request::set_env($environment);
}
/*

11
laravel/request.php
View File

@ -197,6 +197,17 @@ public static function env()
return static::foundation()->server->get('LARAVEL_ENV');
}
/**
* Set the Laravel environment for the current request.
*
* @param string $env
* @return void
*/
public static function set_env($env)
{
static::foundation()->server->set('LARAVEL_ENV', $env);
}
/**
* Determine the current request environment.
*