Fix bugs in Eloquent.

taylorotwell · taylorotwell · commit b0eb9a8b42c8 · 2013-01-05T16:45:34.000-06:00
diff --git a/laravel/database/eloquent/model.php b/laravel/database/eloquent/model.php
@@ -711,10 +711,10 @@ public function __isset($key)
 	{
 		foreach (array('attributes', 'relationships') as $source)
 		{
-			if (array_key_exists($key, $this->$source)) return true;
+			if (array_key_exists($key, $this->{$source})) return ! empty($this->{$source}[$key]);
 		}
 
-		if (method_exists($this, $key)) return true;
+		return false;
 	}
 
 	/**
@@ -727,7 +727,7 @@ public function __unset($key)
 	{
 		foreach (array('attributes', 'relationships') as $source)
 		{
-			unset($this->$source[$key]);
+			unset($this->{$source}[$key]);
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -711,10 +711,10 @@ public function __isset($key)`
`711`	`711`	`{`
`712`	`712`	`foreach (array('attributes', 'relationships') as $source)`
`713`	`713`	`{`
`714`		`- if (array_key_exists($key, $this->$source)) return true;`
	`714`	`+ if (array_key_exists($key, $this->{$source})) return ! empty($this->{$source}[$key]);`
`715`	`715`	`}`
`716`	`716`
`717`		`- if (method_exists($this, $key)) return true;`
	`717`	`+ return false;`
`718`	`718`	`}`
`719`	`719`
`720`	`720`	`/**`
`@@ -727,7 +727,7 @@ public function __unset($key)`
`727`	`727`	`{`
`728`	`728`	`foreach (array('attributes', 'relationships') as $source)`
`729`	`729`	`{`
`730`		`- unset($this->$source[$key]);`
	`730`	`+ unset($this->{$source}[$key]);`
`731`	`731`	`}`
`732`	`732`	`}`
`733`	`733`