Fix for https://github.com/laravel/laravel/issues/789

2012-06-11 20:00:46 +02:00 · 2012-06-11 20:00:46 +02:00 · ac8bd0829e
parent d9802fe656
commit ac8bd0829e
1 changed files with 21 additions and 1 deletions
--- a/laravel/database/eloquent/model.php
+++ b/laravel/database/eloquent/model.php
@ -253,7 +253,27 @@ public static function all()
 	 */
 	public function _with($includes)
 	{
-		$this->includes = (array) $includes;
+		$includes = (array) $includes;
+
+		$all_includes = array();
+
+		foreach($includes as $include)
+		{
+			$nested = explode('.', $include);
+
+			$inc = array();
+
+			foreach($nested as $relation)
+			{
+				$inc[] = $relation;
+
+				$all_includes[] = implode('.', $inc);
+			}
+
+		}
+
+		//remove duplicates and reset the array keys.
+		$this->includes = array_values(array_unique($all_includes));

 		return $this;
 	}