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

This commit is contained in:
Taylor Otwell 2011-08-12 20:16:45 -05:00
commit 19de53ea3c
1 changed files with 1 additions and 1 deletions

View File

@ -418,7 +418,7 @@ private function dynamic_where($method, $parameters)
* @param string $direction * @param string $direction
* @return Query * @return Query
*/ */
public function order_by($column, $direction) public function order_by($column, $direction = 'asc')
{ {
$this->orderings[] = $this->wrap($column).' '.strtoupper($direction); $this->orderings[] = $this->wrap($column).' '.strtoupper($direction);
return $this; return $this;