From 1aabbc38bb3a04f045e319e48e6a2680723ca775 Mon Sep 17 00:00:00 2001
From: Joe Wallace <joew@atiba.com>
Date: Tue, 22 May 2012 11:04:17 -0500
Subject: [PATCH 1/8] Check  against host name for CLI commands

---
 laravel/core.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/laravel/core.php b/laravel/core.php
index 0dcaaca5..eb24b950 100644
--- a/laravel/core.php
+++ b/laravel/core.php
@@ -148,15 +148,19 @@ Request::$foundation = RequestFoundation::createFromGlobals();
 |--------------------------------------------------------------------------
 |
 | 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
 {

From 5e83a58e0012512eba468bc13a2c3c404b122deb Mon Sep 17 00:00:00 2001
From: Ian Landsman <ian@userscape.com>
Date: Wed, 30 May 2012 21:58:50 -0400
Subject: [PATCH 2/8] fix spelling mistake pointed out by @andrey_butov

---
 application/views/home/index.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/views/home/index.blade.php b/application/views/home/index.blade.php
index db228ecc..d75829d0 100644
--- a/application/views/home/index.blade.php
+++ b/application/views/home/index.blade.php
@@ -34,7 +34,7 @@
 				<h2>Grow in knowledge.</h2>
 
 				<p>
-					Leaning to use Laravel is amazingly simple thanks to
+					Learning to use Laravel is amazingly simple thanks to
 					its {{ HTML::link('docs', 'wonderful documentation') }}.
 				</p>
 

From 338b74c1427d4786f041669b6085266f156153a2 Mon Sep 17 00:00:00 2001
From: Kelly Banman <kelly.banman@gmail.com>
Date: Thu, 31 May 2012 16:15:55 -0700
Subject: [PATCH 3/8] Render Responses when cast as string

Signed-off-by: Kelly Banman <kelly.banman@gmail.com>
---
 laravel/response.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/laravel/response.php b/laravel/response.php
index e5472430..b6fa4d84 100644
--- a/laravel/response.php
+++ b/laravel/response.php
@@ -334,4 +334,14 @@ class Response {
 		}
 	}
 
+	/**
+	 * Render the response when cast to string
+	 *
+	 * @return string
+	 */
+	public function __toString()
+	{
+		return $this->render();
+	}
+
 }
\ No newline at end of file

From c583bd4abb26bb6b75f704a75dcee2f2a153dc9f Mon Sep 17 00:00:00 2001
From: Sergii Grebeniuk <grebenjuk.s@gmail.com>
Date: Fri, 1 Jun 2012 14:47:34 +0300
Subject: [PATCH 4/8] Fixed wrong closing tag name

---
 application/views/home/index.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/views/home/index.blade.php b/application/views/home/index.blade.php
index db228ecc..55468b67 100644
--- a/application/views/home/index.blade.php
+++ b/application/views/home/index.blade.php
@@ -18,7 +18,7 @@
 		</header>
 		<div role="main" class="main">
 			<div class="home">
-				<h2>Learn the terrain.</h3>
+				<h2>Learn the terrain.</h2>
 
 				<p>
 					You've landed yourself on our default home page. The route that

From dc81e1b7ab4d2771eff9772d09e9c45c4c138aed Mon Sep 17 00:00:00 2001
From: Rob Meijer <profusion@gmail.com>
Date: Sat, 2 Jun 2012 22:13:09 +0100
Subject: [PATCH 5/8] Add a note about registering a named route that points to
 a controller action.

---
 laravel/documentation/routing.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/laravel/documentation/routing.md b/laravel/documentation/routing.md
index fc607cb9..18c90671 100644
--- a/laravel/documentation/routing.md
+++ b/laravel/documentation/routing.md
@@ -307,6 +307,10 @@ This routing convention may not be desirable for every situation, so you may als
 
 	Route::get('welcome', array('after' => 'log', 'uses' => 'home@index'));
 
+#### Registering a named route that points to a controller action:
+
+	Route::get('welcome', array('as' => 'home.welcome', 'uses' => 'home@index'));
+
 <a name="cli-route-testing"></a>
 ## CLI Route Testing
 

From ab2fcb84ef1af5e72e9da8b18d6193053a295dd0 Mon Sep 17 00:00:00 2001
From: Jason Lewis <jason.lewis1991@gmail.com>
Date: Sun, 3 Jun 2012 19:23:35 +0930
Subject: [PATCH 6/8] Possible fix for issue #378.

Signed-off-by: Jason Lewis <jason.lewis1991@gmail.com>
---
 laravel/database/eloquent/model.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/laravel/database/eloquent/model.php b/laravel/database/eloquent/model.php
index 91aedd6e..a6a32780 100644
--- a/laravel/database/eloquent/model.php
+++ b/laravel/database/eloquent/model.php
@@ -230,11 +230,9 @@ abstract class Model {
 	 * @param  array   $columns
 	 * @return Model
 	 */
-	public static function find($id, $columns = array('*'))
+	public function _find($id, $columns = array('*'))
 	{
-		$model = new static;
-
-		return $model->query()->where(static::$key, '=', $id)->first($columns);
+		return $this->query()->where(static::$key, '=', $id)->first($columns);
 	}
 
 	/**
@@ -749,7 +747,7 @@ abstract class Model {
 		// Some methods need to be accessed both staticly and non-staticly so we'll
 		// keep underscored methods of those methods and intercept calls to them
 		// here so they can be called either way on the model instance.
-		if (in_array($method, array('with')))
+		if (in_array($method, array('with', 'find')))
 		{
 			return call_user_func_array(array($this, '_'.$method), $parameters);
 		}

From b4db0f1b36b6d6c9c5346a51ec7d5a4090f85bb9 Mon Sep 17 00:00:00 2001
From: Jason Lewis <jason.lewis1991@gmail.com>
Date: Sun, 3 Jun 2012 19:45:49 +0930
Subject: [PATCH 7/8] Small change moving array to a variable.

Signed-off-by: Jason Lewis <jason.lewis1991@gmail.com>
---
 laravel/database/eloquent/model.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/laravel/database/eloquent/model.php b/laravel/database/eloquent/model.php
index a6a32780..95e14ab5 100644
--- a/laravel/database/eloquent/model.php
+++ b/laravel/database/eloquent/model.php
@@ -744,10 +744,12 @@ abstract class Model {
 			return static::$$method;
 		}
 
+		$underscored = array('with', 'find')
+
 		// Some methods need to be accessed both staticly and non-staticly so we'll
 		// keep underscored methods of those methods and intercept calls to them
 		// here so they can be called either way on the model instance.
-		if (in_array($method, array('with', 'find')))
+		if (in_array($method, $underscored))
 		{
 			return call_user_func_array(array($this, '_'.$method), $parameters);
 		}

From 6d5239bf3099842535f110518e89e51d1e766f3e Mon Sep 17 00:00:00 2001
From: Jason Lewis <jason.lewis1991@gmail.com>
Date: Sun, 3 Jun 2012 19:47:44 +0930
Subject: [PATCH 8/8] Missed a semi-colon.

Signed-off-by: Jason Lewis <jason.lewis1991@gmail.com>
---
 laravel/database/eloquent/model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/laravel/database/eloquent/model.php b/laravel/database/eloquent/model.php
index 95e14ab5..2c28b8f9 100644
--- a/laravel/database/eloquent/model.php
+++ b/laravel/database/eloquent/model.php
@@ -744,7 +744,7 @@ abstract class Model {
 			return static::$$method;
 		}
 
-		$underscored = array('with', 'find')
+		$underscored = array('with', 'find');
 
 		// Some methods need to be accessed both staticly and non-staticly so we'll
 		// keep underscored methods of those methods and intercept calls to them