aheathershaw/blue-twilight
1
0
Fork 0
Code Issues 32 Pull Requests Releases 15 Wiki Activity

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
Conversation 0 Commits 16 Files Changed 34 +2 -3
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit bfd7a8100d - Show all commits

5
app/Album.php
View File

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