Skip to content

Commit

Permalink
Merge branch 'public/8.5' into public/9.0
Browse files Browse the repository at this point in the history
  • Loading branch information
mherger committed Mar 23, 2024
2 parents b0f668c + 30593e5 commit e49a53b
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions Slim/Web/XMLBrowser.pm
Expand Up @@ -985,7 +985,7 @@ sub handleFeed {
if ($feed->{'favorites_url'} && $favs) {
$details->{'favorites_icon'} = $feed->{'favorites_icon'} || $feed->{'icon'} || $feed->{'image'} || $feed->{'cover'} || Slim::Player::ProtocolHandlers->iconForURL($feed->{'favorites_url'}, $client);
$details->{'favorites_url'} = $feed->{'favorites_url'};
$details->{'favorites_title'} = $feed->{'favorites_title'} || $feed->{'title'} || $feed->{'name'};
$details->{'favorites_title'} = $feed->{'favorites_title'} || $feed->{'name'} || $feed->{'title'};
$details->{'favorites'} = $favs->hasUrl($feed->{'favorites_url'}) ? 2 : 1;
}

Expand All @@ -1001,7 +1001,8 @@ sub handleFeed {

my $type = $item->{'favorites_type'} || $item->{'type'} || 'link';
my $name = $item->{'favorites_title'} || $item->{'name'};
my $icon = $item->{'favorites_icon'} || $item->{'image'} || $item->{'icon'} || Slim::Player::ProtocolHandlers->iconForURL($furl, $client);
my $icon = $item->{'favorites_icon'} || $item->{'image'} || $item->{'icon'} ||
Slim::Player::ProtocolHandlers->iconForURL($furl, $client) || 'html/images/favorites.png';

if ( ($item->{'play'} && !$item->{'favorites_type'})
|| ($type eq 'playlist' && $furl =~ /^(file|db):/)
Expand Down

0 comments on commit e49a53b

Please sign in to comment.