Merge branch 'master' of https://github.com/laravel/laravel

briankiewel · Feb 1, 2015 · d4a7767 · d4a7767
2 parents 3f7938f + 4afcd8c
commit d4a7767
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/app/filters.php b/app/filters.php
@@ -41,10 +41,7 @@
 		{
 			return Response::make('Unauthorized', 401);
 		}
-		else
-		{
-			return Redirect::guest('login');
-		}
+		return Redirect::guest('login');
 	}
 });
 
@@ -83,7 +80,7 @@
 
 Route::filter('csrf', function()
 {
-	if (Session::token() != Input::get('_token'))
+	if (Session::token() !== Input::get('_token'))
 	{
 		throw new Illuminate\Session\TokenMismatchException;
 	}

diff --git a/app/lang/en/validation.php b/app/lang/en/validation.php
@@ -27,7 +27,7 @@
 		"string"  => "The :attribute must be between :min and :max characters.",
 		"array"   => "The :attribute must have between :min and :max items.",
 	),
-	"boolean"              => "The :attribute field must be true or false",
+	"boolean"              => "The :attribute field must be true or false.",
 	"confirmed"            => "The :attribute confirmation does not match.",
 	"date"                 => "The :attribute is not a valid date.",
 	"date_format"          => "The :attribute does not match the format :format.",