Merge pull request laravel#4464 from ambrella/4.2

taylorotwell · taylorotwell · commit 711a627824c3 · 2014-05-23T08:34:01.000-05:00
[4.2] withTrashed() constraint does not work with morphTo() relations.
diff --git a/src/Illuminate/Database/Eloquent/Relations/MorphTo.php b/src/Illuminate/Database/Eloquent/Relations/MorphTo.php
@@ -28,6 +28,13 @@ class MorphTo extends BelongsTo {
 	 */
 	protected $dictionary = array();
 
+	/*
+	 * Indicates if soft-deleted model instances must be fetched or not
+	 *
+	 * @var bool
+	 */
+	protected $withTrashed = false;
+
 	/**
 	 * Create a new belongs to relationship instance.
 	 *
@@ -150,6 +157,11 @@ protected function getResultsByType($type)
 	{
 		$instance = $this->createModelByType($type);
 
+		if ($this->withTrashed && $instance->newQuery()->getMacro('withTrashed') !== null)
+		{
+			$instance = $instance->withTrashed();
+		}
+
 		$key = $instance->getKeyName();
 
 		return $instance->whereIn($key, $this->gatherKeysByType($type)->all())->get();
@@ -193,4 +205,16 @@ public function getDictionary()
 		return $this->dictionary;
 	}
 
+	/**
+	 * Fetch soft-deleted model instances with query
+	 *
+	 * @return MorphTo
+	 */
+	public function withTrashed()
+	{
+		$this->withTrashed = true;
+
+		return $this;
+	}
+
 }
