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/relationships/relationship.php
+++ b/laravel/database/eloquent/relationships/relationship.php
@@ -51,7 +51,7 @@ abstract class Relationship extends Query {
 		// Next we'll set the fluent query builder for the relationship and
 		// constrain the query such that it only returns the models that
 		// are appropriate for the relationship.
-		$this->table = $this->query();
+		$this->table = $this->table();

 		$this->constrain();
 	}