Merge branch 'develop' of github.com:laravel/laravel into develop

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
@@ -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>
 

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
 {

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);
 	}
 
 	/**
@@ -746,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')))
+		if (in_array($method, $underscored))
 		{
 			return call_user_func_array(array($this, '_'.$method), $parameters);
 		}

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
 

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