Mirrors/koel
2
0
Fork 0
mirror of https://github.com/koel/koel synced 2024-11-24 21:23:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into test

Browse source
This commit is contained in:
Phan An 2017-06-10 12:36:55 +01:00
commit f448b0e8e3
2 changed files with 1 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/Models/Artist.php
View file

@ -126,16 +126,6 @@ class Artist extends Model
return $info;
}
/**
* Get songs *contributed* (in compilation albums) by the artist.
*
* @return \Illuminate\Database\Eloquent\Collection
*/
public function getContributedSongs()
{
return Song::whereContributingArtistId($this->id)->get();
}
/**
* Turn the image name into its absolute URL.
*

5
app/Services/Download.php
View file

@ -118,9 +118,6 @@ class Download
protected function fromArtist(Artist $artist)
{
// Don't forget the contributed songs.
$songs = $artist->songs->merge($artist->getContributedSongs());
return $this->fromMultipleSongs($songs);
return $this->fromMultipleSongs($artist->songs);
}
}