[Slim-Checkins] r10054 - in /branches/6.5/server: Changelog6.html Slim/Formats/MP3.pm Slim/Web/Pages/BrowseDB.pm

[dsully at svn.slimdevices.com]

Author: dsully
Date: Tue Sep 26 14:01:19 2006
New Revision: 10054

URL: http://svn.slimdevices.com?rev=10054&view=rev
Log:
Bug: 4221, 4189
Description: Merge from trunk -r 10051:10053

Modified:
    branches/6.5/server/Changelog6.html
    branches/6.5/server/Slim/Formats/MP3.pm
    branches/6.5/server/Slim/Web/Pages/BrowseDB.pm

Modified: branches/6.5/server/Changelog6.html
URL: http://svn.slimdevices.com/branches/6.5/server/Changelog6.html?rev=10054&r1=10053&r2=10054&view=diff
==============================================================================
--- branches/6.5/server/Changelog6.html (original)
+++ branches/6.5/server/Changelog6.html Tue Sep 26 14:01:19 2006
@@ -14,10 +14,12 @@
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4171">#4171</a> - Default2 redirect to Default.</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4173">#4173</a> - press right to add to favorites option disappears once you've used it, until you restart server</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4173">#4178</a> - Live365 stations don't have a note symbol</li>
+		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4189">#4189</a> - mp3 file playback gets truncated</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4190">#4190</a> - xmlbrower transition problem</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4191">#4191</a> - Live365 Search has missing strings</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4192">#4192</a> - IE doesn't refresh status</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4213">#4213</a> - Slimserver can crash due to display being deleted from client object at forget time</li>
+		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4221">#4221</a> - 6.5 crashes on artist breadcrumb</li>
 	<ul>
 </ul>
 

Modified: branches/6.5/server/Slim/Formats/MP3.pm
URL: http://svn.slimdevices.com/branches/6.5/server/Slim/Formats/MP3.pm?rev=10054&r1=10053&r2=10054&view=diff
==============================================================================
--- branches/6.5/server/Slim/Formats/MP3.pm (original)
+++ branches/6.5/server/Slim/Formats/MP3.pm Tue Sep 26 14:01:19 2006
@@ -156,7 +156,7 @@
 
 	# we'll always have $info, as it's machine generated.
 	if (scalar keys %tags && scalar keys %{$info}) {
-		%$info = (%$info, %tags);
+		%$info = (%tags, %$info);
 	}
 
 	# Strip out any nulls.

Modified: branches/6.5/server/Slim/Web/Pages/BrowseDB.pm
URL: http://svn.slimdevices.com/branches/6.5/server/Slim/Web/Pages/BrowseDB.pm?rev=10054&r1=10053&r2=10054&view=diff
==============================================================================
--- branches/6.5/server/Slim/Web/Pages/BrowseDB.pm (original)
+++ branches/6.5/server/Slim/Web/Pages/BrowseDB.pm Tue Sep 26 14:01:19 2006
@@ -174,14 +174,17 @@
 
 			$attrs{$levelKey} = $params->{$levelKey};
 
+			# Don't include the orderBy when the next level's
+			# (track) orderBy include me.* otherwise the
+			# breadcrumb link will be bogus.
 			push @{$params->{'pwd_list'}}, {
 				 'hreftype'     => 'browseDb',
 				 'title'        => $value,
 				 'hierarchy'    => $hierarchy,
 				 'level'        => $i+1,
-				 'orderBy'      => $orderBy,
+				 'orderBy'      => ($orderBy =~ /\bme\./ ? '' : $orderBy),
 				 'attributes'   => _attributesToKeyValuePair(\%attrs),
-			}
+			};
 		}
 	}