From 1044367c1e3392ab6e9343f55b4fd8404e0e23f5 Mon Sep 17 00:00:00 2001 From: Anton Khodakivskiy Date: Mon, 19 Mar 2012 07:47:20 -0400 Subject: [PATCH 1/2] added default values to the signature of Query::left_join to allow closure-based join conditions --- laravel/database/query.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/laravel/database/query.php b/laravel/database/query.php index d0503d6a..95ad17a6 100644 --- a/laravel/database/query.php +++ b/laravel/database/query.php @@ -182,7 +182,7 @@ public function join($table, $column1, $operator = null, $column2 = null, $type * @param string $column2 * @return Query */ - public function left_join($table, $column1, $operator, $column2) + public function left_join($table, $column1, $operator = null, $column2 = null) { return $this->join($table, $column1, $operator, $column2, 'LEFT'); } From 88b006901364b2acd87453f909c98e0e20fbf4da Mon Sep 17 00:00:00 2001 From: Loic Sharma Date: Mon, 19 Mar 2012 23:32:38 -0500 Subject: [PATCH 2/2] Fixed typo --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index da5fb487..e05ef395 100644 --- a/readme.md +++ b/readme.md @@ -41,7 +41,7 @@ ### Contributing to Laravel Contributions are encouraged and welcome; however, please review the Developer Certificate of Origin in the "license.txt" file included in the repository. All commits must be signed off using the "-s" switch. - git commit -s -m "thie commit will be signed off automatically!" + git commit -s -m "this commit will be signed off automatically!" ### License