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

2011-08-12 20:16:45 -05:00
parent 7579715563 904588a51a
commit 19de53ea3c
1 changed files with 1 additions and 1 deletions
--- a/system/db/query.php
+++ b/system/db/query.php
@@ -418,7 +418,7 @@ class Query {
 	 * @param  string  $direction
 	 * @return Query
 	 */
-	public function order_by($column, $direction)
+	public function order_by($column, $direction = 'asc')
 	{
 		$this->orderings[] = $this->wrap($column).' '.strtoupper($direction);
 		return $this;