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

19de53ea · Taylor Otwell · 75797155 · 904588a5 · 19de53ea
Commit 19de53ea authored Aug 13, 2011 by Taylor Otwell
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

query.php system/db/query.php +1 -1

No files found.
--- 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;