Merge branch 'staging' into develop

2012-03-29 22:11:42 -05:00
parent 579bc8719f 062ae8756c
commit 3e0d468470
6 changed files with 20 additions and 7 deletions
--- a/laravel/database/eloquent/query.php
+++ b/laravel/database/eloquent/query.php
@@ -43,7 +43,7 @@ class Query {
 	{
 		$this->model = ($model instanceof Model) ? $model : new $model;

-		$this->table = $this->query();
+		$this->table = $this->table();
 	}

 	/**
@@ -245,7 +245,7 @@ class Query {
 	 *
 	 * @return Query
 	 */
-	protected function query()
+	protected function table()
 	{
 		return $this->connection()->table($this->model->table());
 	}