[Slim-Checkins] r10053 - in /trunk/server: Changelog6.html Slim/Web/Pages/BrowseDB.pm

[dsully at svn.slimdevices.com]

Author: dsully
Date: Tue Sep 26 13:58:44 2006
New Revision: 10053

URL: http://svn.slimdevices.com?rev=10053&view=rev
Log:
Bug: 4221
Description: Don't include orderBy in the breadcrumb link if it references me.*

Modified:
    trunk/server/Changelog6.html
    trunk/server/Slim/Web/Pages/BrowseDB.pm

Modified: trunk/server/Changelog6.html
URL: http://svn.slimdevices.com/trunk/server/Changelog6.html?rev=10053&r1=10052&r2=10053&view=diff
==============================================================================
--- trunk/server/Changelog6.html (original)
+++ trunk/server/Changelog6.html Tue Sep 26 13:58:44 2006
@@ -15,6 +15,7 @@
 		<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=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=4221">#4221</a> - 6.5 crashes on artist breadcrumb</li>
 	<ul>
 </ul>
 

Modified: trunk/server/Slim/Web/Pages/BrowseDB.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Web/Pages/BrowseDB.pm?rev=10053&r1=10052&r2=10053&view=diff
==============================================================================
--- trunk/server/Slim/Web/Pages/BrowseDB.pm (original)
+++ trunk/server/Slim/Web/Pages/BrowseDB.pm Tue Sep 26 13:58:44 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),
-			}
+			};
 		}
 	}