[Slim-Checkins] r10164 - in /branches/6.5/server: Changelog6.html Slim/Schema/Track.pm

[dsully at svn.slimdevices.com]

Author: dsully
Date: Tue Oct  3 16:05:00 2006
New Revision: 10164

URL: http://svn.slimdevices.com?rev=10164&view=rev
Log:
Bug: 4024
Description: Merge from trunk -r 10162:10163

Modified:
    branches/6.5/server/Changelog6.html
    branches/6.5/server/Slim/Schema/Track.pm

Modified: branches/6.5/server/Changelog6.html
URL: http://svn.slimdevices.com/branches/6.5/server/Changelog6.html?rev=10164&r1=10163&r2=10164&view=diff
==============================================================================
--- branches/6.5/server/Changelog6.html (original)
+++ branches/6.5/server/Changelog6.html Tue Oct  3 16:05:00 2006
@@ -7,6 +7,7 @@
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=3318">#3318</a> - MusicMagic: Songs with national chars get duplicated</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=3696">#3696</a> - Random Mix fails</li>
  		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=3915">#3915</a> - Softsqueeze animate on screen 2 clears screen 1</li>
+		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4024">#4024</a> - Artist name is not shown in Squeezebox display if ALBUMARTIST is set</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4071">#4071</a> - Band Names in mp3 Tags don't always work</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4077">#4077</a> - CUE files YEAR and GENRE not always working</li>
  		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4135">#4135</a> - WAV format files play incorrectly</li>

Modified: branches/6.5/server/Slim/Schema/Track.pm
URL: http://svn.slimdevices.com/branches/6.5/server/Slim/Schema/Track.pm?rev=10164&r1=10163&r2=10164&view=diff
==============================================================================
--- branches/6.5/server/Slim/Schema/Track.pm (original)
+++ branches/6.5/server/Slim/Schema/Track.pm Tue Oct  3 16:05:00 2006
@@ -96,9 +96,8 @@
 sub artists {
 	my $self = shift;
 
-	# XXXX - not sure who the callers are here, and if this should include
-	# TRACKARTISTS or not.
-	return $self->contributorsOfType('ARTIST')->all;
+	# Bug 4024 - include both ARTIST & TRACKARTIST here.
+	return $self->contributorsOfType(qw(ARTIST TRACKARTIST))->all;
 }
 
 sub artistsWithAttributes {