Merge user feeds & followers #118

Merged
aheathershaw merged 16 commits from feature/111-user-activity-feeds into master 2018-11-19 19:08:50 +00:00
Showing only changes of commit bfd7a8100d - Show all commits

View File

@ -203,8 +203,6 @@ class Album extends Model
return $this->hasMany(Photo::class);
}
public function redirects()
{
return $this->hasMany(AlbumRedirect::class);
@ -217,13 +215,14 @@ class Album extends Model
public function thumbnailUrl($thumbnailName)
{
/** @var Photo $photo */
$photo = $this->photos()
->inRandomOrder()
->first();
if (!is_null($photo))
{
return $this->getAlbumSource()->getUrlToPhoto($photo, $thumbnailName);
return $photo->thumbnailUrl($thumbnailName);
}
// See if any child albums have an image