From e12b554cbbcfa816a08b3faea1c616da59285b54 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Sun, 3 Jun 2012 17:37:46 -0500 Subject: [PATCH] cleaning up. --- laravel/core.php | 10 ++++++---- laravel/documentation/changes.md | 3 +++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/laravel/core.php b/laravel/core.php index eb24b950..a38bf9dd 100644 --- a/laravel/core.php +++ b/laravel/core.php @@ -149,16 +149,18 @@ | | 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 -| 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". +| 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)) { + if ( ! isset($environment)) + { $environment = Request::detect_env($environments, gethostname()); } } diff --git a/laravel/documentation/changes.md b/laravel/documentation/changes.md index b4fb12f2..ff80b6f3 100644 --- a/laravel/documentation/changes.md +++ b/laravel/documentation/changes.md @@ -34,6 +34,9 @@ ## Laravel 3.2.2 - Overall improvement of Postgres support. - 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. ## Upgrading From 3.2.1