Fixing bugs in eloquent relating to namespaces.

2012-03-21 15:45:05 -05:00
parent 8457238ab1
commit 30204e082b
2 changed files with 3 additions and 3 deletions
--- a/laravel/database/eloquent/relationships/relationship.php
+++ b/laravel/database/eloquent/relationships/relationship.php
@@ -62,7 +62,7 @@ abstract class Relationship extends Query {
 		// namespace, and we'll append "_id" to the name.
 		if (is_object($model))
 		{
-			$model = get_class($model);
+			$model = class_basename($model);
 		}

 		return strtolower(basename($model).'_id');
@@ -88,7 +88,7 @@ abstract class Relationship extends Query {
 	 */
 	protected function foreign_key()
 	{
-		return Relationship::foreign($this->base, $this->foreign);
+		return static::foreign($this->base, $this->foreign);
 	}

 }