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

cleaning up.

This commit is contained in:
Taylor Otwell 2012-06-03 17:37:46 -05:00
parent d9c0dc0c35
commit e12b554cbb
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
laravel/core.php
View File

@ -149,16 +149,18 @@
| |
| Next we're ready to determine the application environment. This may be | Next we're ready to determine the application environment. This may be
| set either via the command line options or via the mapping of URIs to | 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 | environments that lives in the "paths.php" file for the application
| is parsed. When determining the CLI environment, the "--env" CLI option | and is parsed. When determining the CLI environment, the "--env"
| overrides the mapping in "paths.php". | CLI option overrides the mapping in "paths.php".
| |
*/ */
if (Request::cli()) if (Request::cli())
{ {
$environment = get_cli_option('env'); $environment = get_cli_option('env');
if (! isset($environment)) { if ( ! isset($environment))
{
$environment = Request::detect_env($environments, gethostname()); $environment = Request::detect_env($environments, gethostname());
} }
} }

3
laravel/documentation/changes.md
View File

@ -34,6 +34,9 @@ ## Laravel 3.2.2
- Overall improvement of Postgres support. - Overall improvement of Postgres support.
- Fix issue in SQL Server Schema grammar. - Fix issue in SQL Server Schema grammar.
- Fix issue with eager loading and `first` or `find`.
- Fix bug causing parameters to not be passed to `IoC::resolve`.
- Allow the specification of hostnames in environment setup.
<a name="upgrade-3.2.2"></a> <a name="upgrade-3.2.2"></a>
## Upgrading From 3.2.1 ## Upgrading From 3.2.1