Merge pull request #4871 from soundrussian/4.2

Return trashed models with morphTo() if told so on non-eager queries (fixes #4870)

Eloquent/Relations/MorphTo.php

@@ -161,10 +161,7 @@ protected function getResultsByType($type)
 
 		$query = $instance->newQuery();
 
-		if ($this->withTrashed && $query->getMacro('withTrashed') !== null)
-		{
-			$query = $query->withTrashed();
-		}
+		$query = $this->useWithTrashed($query);
 
 		return $query->whereIn($key, $this->gatherKeysByType($type)->all())->get();
 	}
@@ -216,7 +213,24 @@ public function withTrashed()
 	{
 		$this->withTrashed = true;
 
+		$this->query = $this->useWithTrashed($this->query);
+
 		return $this;
 	}
 
+	/**
+	 * Return trashed models with query if told so
+	 *
+	 * @param  \Illuminate\Database\Eloquent\Builder  $query
+	 * @return \Illuminate\Database\Eloquent\Builder
+	 */
+	protected function useWithTrashed(Builder $query)
+	{
+		if ($this->withTrashed && $query->getMacro('withTrashed') !== null)
+		{
+			return $query->withTrashed();
+		}
+		return $query;
+	}
+
 }