Merge branch 'master' into develop

2012-03-21 10:59:35 -05:00
parent ea8d80d67d 32e194ad21
commit 0893f3cca6
2 changed files with 2 additions and 2 deletions
--- a/laravel/database/query.php
+++ b/laravel/database/query.php
@@ -182,7 +182,7 @@ class Query {
 	 * @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');
 	}