From fdeb06e54c9c3a356760f670f98202e70269d0b7 Mon Sep 17 00:00:00 2001 From: freezestart Date: Sat, 8 Sep 2012 21:13:56 +0800 Subject: [PATCH 1/4] fixed readme.md wrong symbol Signed-off-by: freezestart --- readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/readme.md b/readme.md index 76367066..56f19dc6 100644 --- a/readme.md +++ b/readme.md @@ -27,7 +27,7 @@ enjoy, not something that is painful. Enjoy the fresh air. Route::get('/', function() { - return "Hello World!": + return "Hello World!"; }); ``` @@ -64,4 +64,4 @@ git commit -s -m "this commit will be signed off automatically!" ## License -Laravel is open-sourced software licensed under the MIT License. \ No newline at end of file +Laravel is open-sourced software licensed under the MIT License. From 1ee55a3b38ad2bcf4dea5d2dcc4f5371c84588c2 Mon Sep 17 00:00:00 2001 From: Duru Can Celasun Date: Fri, 14 Sep 2012 13:28:02 +0300 Subject: [PATCH 2/4] Fix a tiny typo s/encourage/encouraged --- laravel/documentation/controllers.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/laravel/documentation/controllers.md b/laravel/documentation/controllers.md index 0f8555f2..eb3e490a 100644 --- a/laravel/documentation/controllers.md +++ b/laravel/documentation/controllers.md @@ -17,7 +17,7 @@ Controllers are classes that are responsible for accepting user input and managing interactions between models, libraries, and views. Typically, they will ask a model for data, and then return a view that presents that data to the user. -The usage of controllers is the most common method of implementing application logic in modern web-development. However, Laravel also empowers developers to implement their application logic within routing declarations. This is explored in detail in the [routing document](/docs/routing). New users are encourage to start with controllers. There is nothing that route-based application logic can do that controllers can't. +The usage of controllers is the most common method of implementing application logic in modern web-development. However, Laravel also empowers developers to implement their application logic within routing declarations. This is explored in detail in the [routing document](/docs/routing). New users are encouraged to start with controllers. There is nothing that route-based application logic can do that controllers can't. Controller classes should be stored in **application/controllers** and should extend the Base\_Controller class. A Home\_Controller class is included with Laravel. From 33b5f6377c5fdf83acb413f938c9644779d4095f Mon Sep 17 00:00:00 2001 From: Shawn McCool Date: Wed, 19 Sep 2012 18:13:31 +0300 Subject: [PATCH 3/4] Update laravel/documentation/routing.md Added a warning about using Controller::detect() for routing. --- laravel/documentation/routing.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/laravel/documentation/routing.md b/laravel/documentation/routing.md index eee1bb8c..38ad8075 100644 --- a/laravel/documentation/routing.md +++ b/laravel/documentation/routing.md @@ -295,6 +295,8 @@ The **Controller::detect** method simply returns an array of all of the controll If you wish to automatically detect the controllers in a bundle, just pass the bundle name to the method. If no bundle is specified, the application folder's controller directory will be searched. +> **Note:** It is important to note that this method gives you no control over the order in which controllers are loaded. Controller::detect() should only be used to Route controllers in very small sites. "Manually" routing controllers gives you much more control, is more self-documenting, and is certainly advised. + #### Register all controllers for the "admin" bundle: Route::controller(Controller::detect('admin')); From 8c580d17fbb006be811a7979a7faf305ad7ca697 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Mon, 24 Sep 2012 01:01:14 +0930 Subject: [PATCH 4/4] You can only pass the ID of a user, not an object. Signed-off-by: Jason Lewis --- laravel/documentation/auth/usage.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/laravel/documentation/auth/usage.md b/laravel/documentation/auth/usage.md index 8a9a0650..4e7ba5fe 100644 --- a/laravel/documentation/auth/usage.md +++ b/laravel/documentation/auth/usage.md @@ -50,9 +50,9 @@ To determine if the user of your application is logged in, call the **check** me return "You're logged in!"; } -Use the **login** method to login a user without checking their credentials, such as after a user first registers to use your application. Just pass your user object or the user's ID: +Use the **login** method to login a user without checking their credentials, such as after a user first registers to use your application. Just pass the user's ID: - Auth::login($user); + Auth::login($user->id); Auth::login(15);