diff -upBr server/Slim/Music/LiveSearch.pm Slim/Music/LiveSearch.pm
--- server/Slim/Music/LiveSearch.pm	2005-05-19 14:13:42.578125000 -0700
+++ Slim/Music/LiveSearch.pm	2005-05-19 13:04:11.046875000 -0700
@@ -43,7 +43,7 @@ sub query {
 
 		if (!Slim::Utils::Prefs::get('composerInArtists')) {
 
-               zz 	$find->{'contributor.role'} = $Slim::DataStores::DBI::ContributorTrack::contributorToRoleMap{'ARTIST'};
+			$find->{'contributor.role'} = $Slim::DataStores::DBI::ContributorTrack::contributorToRoleMap{'ARTIST'};
 		}
 
 		push @data, [ $type, [$ds->find($queries{$type}->[0], $find, undef, $limit, 0)] ];
diff -upBr server/Slim/Web/Pages.pm Slim/Web/Pages.pm
--- server/Slim/Web/Pages.pm	2005-05-19 14:13:42.375000000 -0700
+++ Slim/Web/Pages.pm	2005-05-19 13:03:57.203125000 -0700
@@ -94,7 +94,8 @@ sub init {
 				$form->{'includeArtist'}       = ($webFormat !~ /ARTIST/);
 				$form->{'includeAlbum'}        = ($webFormat !~ /ALBUM/) ;
 				$form->{'item'}	               = $item->id;
-				$form->{'itempath'}	       = $item->url;
+				$form->{'itempath'}	           = $item->url;
+				$form->{'itemobj'}             = $item;
 
 				my $Imports = Slim::Music::Import::importers();
 				for my $mixer (keys %{$Imports}) {
@@ -1780,7 +1781,6 @@ sub _fillInSearchResults {
 			);
 		}
 		
-		my $webFormat  = Slim::Utils::Prefs::getInd("titleFormat", Slim::Utils::Prefs::get("titleFormatWeb"));
 		my $itemnumber = 0;
 		my $lastAnchor = '';
 
@@ -1791,22 +1791,24 @@ sub _fillInSearchResults {
 			my $sorted    = $item->can('titlesort') ? $item->titlesort() : $item->namesort();
 			my %list_form = %$params;
 
-			$list_form{'includeArtist'}    = ($webFormat !~ /ARTIST/);
-			$list_form{'includeAlbum'}     = ($webFormat !~ /ALBUM/) ;
-
 			if ($type eq 'track') {
-				$list_form{'text'}    = Slim::Music::Info::standardTitle(undef, $item);
-				$list_form{'artist'}   = $item->artist();
-				$list_form{'album'}    = $item->album();
-				$list_form{'item'}     = $item->id();
-				$list_form{'itempath'} = $item->url();
+				my $fieldInfo = Slim::Web::Pages::fieldInfo();
+				
+				# if $ds is undefined here, make sure we have it now.
+				$ds = Slim::Music::Info::getCurrentDataStore() unless $ds;
+				
+				# If we can't get an object for this url, skip it, as the
+				# user's database is likely out of date. Bug 863
+				my $trackObj  = $ds->objectForUrl($item) || next;
+				
+				my $itemname = &{$fieldInfo->{'track'}->{'resultToName'}}($trackObj);
+				&{$fieldInfo->{'track'}->{'listItem'}}($ds, \%list_form, $trackObj, $itemname, 0);
 
 			} else {
 
 				$list_form{'text'} = $title;
 			}
 
-			$list_form{'itemobj'}      = $item;
 			$list_form{'attributes'}   = '&' . join('=', $type, $item->id());
 			$list_form{'hierarchy'}	   = $hierarchy{$type};
 			$list_form{'level'}        = 0;
diff -upBr server/Plugins/MoodLogic/HTML/Default/plugins/MoodLogic/instant_mix_list.html Plugins/MoodLogic/HTML/Default/plugins/MoodLogic/instant_mix_list.html
--- server/Plugins/MoodLogic/HTML/Default/plugins/MoodLogic/instant_mix_list.html	2005-05-19 14:13:42.546875000 -0700
+++ Plugins/MoodLogic/HTML/Default/plugins/MoodLogic/instant_mix_list.html	2005-05-19 12:07:27.921875000 -0700
@@ -1,16 +1,19 @@
 <tr>
   <td width="100%" [% IF odd %]class="odd"[% END %] [% IF not odd %]class="even"[% END %]>
-      <a href="[% webroot %]songinfo.html?item=[% item | uri %]&player=[% player | uri %]">[% title %]</a>
+      <a href="[% webroot %]songinfo.html?item=[% item | uri %]&player=[% player | uri %]">[% text %]</a>
       [% IF includeAlbum && album  && album != noAlbum %][% "FROM" | string %]
       <i><a href="[% webroot %]browsedb.html?hierarchy=album,track&level=1&album=[% itemobj.album.id %]&player=[% player | uri %]" target="browser">[% album | html %]</a></i>[% END %]
       [% IF includeArtist && artist && artist != noArtist %][% "BY" | string %] 
       <a href="[% webroot %]browsedb.html?hierarchy=artist,album,track&level=1&artist=[% itemobj.contributorsOfType('artist').first.id %]&player=[% player | uri %]" target="browser">[% artist | html %]</a>[% END %]
   </td>
   <td align="right" width="13" [% IF odd %]class="odd"[% END %] [% IF not odd %]class="even"[% END %]>
-      <nobr><a href="status_header.html?p0=playlist&p1=play&p2=[% itempath | uri %]&player=[% player | uri %]" target="status"><img src="[% webroot %]html/images/b_play.gif" width=13 height=13 alt="[% "PLAY" | string %]" title="[% "PLAY" | string %]"></a></nobr>
+      <nobr><a href="[% webroot %]status_header.html?p0=playlist&p1=play&p2=[% itempath | uri %]&player=[% player | uri %]" target="status"><img src="[% webroot %]html/images/b_play.gif" width=13 height=13 alt="[% "PLAY" | string %]" title="[% "PLAY" | string %]"></a></nobr>
 </td>
 
 <td  align="right" width="13" [% IF odd %]class="odd"[% END %] [% IF not odd %]class="even"[% END %]>
-      <nobr><a href="status_header.html?p0=playlist&p1=append&p2=[% itempath | uri %]&player=[% player | uri %]" target="status"><img src="[% webroot %]html/images/b_add.gif" width=13 height=13 alt="[% "ADD_TO_PLAYLIST" | string %]" title="[% "ADD_TO_PLAYLIST" | string %]"></a></nobr>
+      <nobr><a href="[% webroot %]status_header.html?p0=playlist&p1=append&p2=[% itempath | uri %]&player=[% player | uri %]" target="status"><img src="[% webroot %]html/images/b_add.gif" width=13 height=13 alt="[% "ADD_TO_PLAYLIST" | string %]" title="[% "ADD_TO_PLAYLIST" | string %]"></a></nobr>
   </td>
+	[% FOREACH mixer = mixerlinks.values.sort %]
+		[% PROCESS $mixer %]
+	[% END %]
 </tr>
diff -upBr server/Plugins/MoodLogic/HTML/Default/plugins/MoodLogic/mixerlink.html Plugins/MoodLogic/HTML/Default/plugins/MoodLogic/mixerlink.html
--- server/Plugins/MoodLogic/HTML/Default/plugins/MoodLogic/mixerlink.html	2005-05-19 14:13:42.656250000 -0700
+++ Plugins/MoodLogic/HTML/Default/plugins/MoodLogic/mixerlink.html	2005-05-19 13:49:38.343750000 -0700
@@ -1,4 +1,4 @@
   <td [% IF odd %]class="odd" bgcolor="#d0d0d0"[% END %] [% IF not odd %]class="even" bgcolor="#FFFFFF"[% END %]>
-      [% IF mixable_descend %] <nobr><a href="plugins/MoodLogic/mood_wheel.html?genre=[% genre | uri %]&artist=[% artist | uri %]&album=[% album | uri %]&player=[% player | uri %]"><img src="plugins/MoodLogic/html/images/b_mix.gif" width=13 height=13  alt="[% "MOODLOGIC_MIX" | string %]" title="[% "MOODLOGIC_MIX" | string %]"></a></nobr> [% END %]
-      [% IF mixable_not_descend %] <nobr><a href="plugins/MoodLogic/instant_mix.html?song=[% item | uri %]&genre=[% genre | uri %]&artist=[% artist | uri %]&album=[% album | uri %]&player=[% player | uri %]"><img src="plugins/MoodLogic/html/images/b_mix.gif" width=13 height=13  alt="[% "MOODLOGIC_MIX" | string %]" title="[% "MOODLOGIC_MIX" | string %]"></a></nobr> [% END %]
+      [% IF mixable_descend %] <nobr><a href="[% webroot %]plugins/MoodLogic/mood_wheel.html?genre=[% genre | uri %]&artist=[% artist | uri %]&album=[% album | uri %]&player=[% player | uri %]"><img src="[% webroot %]plugins/MoodLogic/html/images/b_mix.gif" width=13 height=13  alt="[% "MOODLOGIC_MIX" | string %]" title="[% "MOODLOGIC_MIX" | string %]"></a></nobr> [% END %]
+      [% IF mixable_not_descend %] <nobr><a href="[% webroot %]plugins/MoodLogic/instant_mix.html?song=[% item | uri %]&genre=[% genre | uri %]&artist=[% artist | uri %]&album=[% album | uri %]&player=[% player | uri %]"><img src="[% webroot %]plugins/MoodLogic/html/images/b_mix.gif" width=13 height=13  alt="[% "MOODLOGIC_MIX" | string %]" title="[% "MOODLOGIC_MIX" | string %]"></a></nobr> [% END %]
   </td>
diff -upBr server/Plugins/MoodLogic/HTML/EN/plugins/MoodLogic/instant_mix_list.html Plugins/MoodLogic/HTML/EN/plugins/MoodLogic/instant_mix_list.html
--- server/Plugins/MoodLogic/HTML/EN/plugins/MoodLogic/instant_mix_list.html	2005-05-19 14:13:42.531250000 -0700
+++ Plugins/MoodLogic/HTML/EN/plugins/MoodLogic/instant_mix_list.html	2005-05-19 11:59:39.390625000 -0700
@@ -1,10 +1,13 @@
 <tr>
   <td [% IF odd %]class="odd" bgcolor="#d0d0d0"[% END %] [% IF not odd %]class="even" bgcolor="#FFFFFF"[% END %]>
-      <a href="[% webroot %]songinfo.html?item=[% item | uri %]&player=[% player | uri %]">[% title %]</a>
+      <a href="[% webroot %]songinfo.html?item=[% item | uri %]&player=[% player | uri %]">[% text %]</a>
       [% IF includeAlbum && album  && album != noAlbum %][% "FROM" | string %]
       <i><a href="[% webroot %]browsedb.html?hierarchy=album,track&level=1&album=[% itemobj.album.id %]&player=[% player | uri %]" target="browser">[% album | html %]</a></i>[% END %]
       [% IF includeArtist && artist && artist != noArtist %][% "BY" | string %] 
       <a href="[% webroot %]browsedb.html?hierarchy=artist,album,track&level=1&artist=[% itemobj.contributorsOfType('artist').first.id %]&player=[% player | uri %]" target="browser">[% artist | html %]</a>[% END %]
   </td>
+	[% FOREACH mixer = mixerlinks.values.sort %]
+		[% PROCESS $mixer %]
+	[% END %]
 </tr>
 
diff -upBr server/Plugins/MoodLogic/HTML/Fishbone/plugins/MoodLogic/instant_mix_list.html Plugins/MoodLogic/HTML/Fishbone/plugins/MoodLogic/instant_mix_list.html
--- server/Plugins/MoodLogic/HTML/Fishbone/plugins/MoodLogic/instant_mix_list.html	2005-05-19 14:13:42.500000000 -0700
+++ Plugins/MoodLogic/HTML/Fishbone/plugins/MoodLogic/instant_mix_list.html	2005-05-19 12:01:27.078125000 -0700
@@ -1,7 +1,7 @@
 <tr>
   <td  class="listing">&nbsp;<nobr>
 	  [% IF anchor %]<a name="[% anchor %]"></a>[% END %]
-		<a href="[% webroot %]songinfo.html?itempath=[% itempath | uri %]&player=[% player | uri %]"><b>[% title %]</b></a>
+		<a href="[% webroot %]songinfo.html?item=[% item | uri %]&player=[% player | uri %]"><b>[% text %]</b></a>
 		[% IF includeArtist && artist && artist != noArtist %][% "BY" | string %] 
 		<a href="[% webroot %]browsedb.html?hierarchy=artist,album,track&level=1&artist=[% itemobj.contributorsOfType('artist').first.id %]&player=[% player | uri %]" target="browser">[% artist | html %]</a>[% END %]
 		[% IF includeAlbum && album  && album != noAlbum %][% "FROM" | string %]
@@ -22,5 +22,8 @@
   <td  class="listing" width="11" align="center">
       <nobr><a href="[% webroot %]status_header.html?p0=playlist&p1=deleteitem&p2=[% itempath | uri %]&player=[% player | uri %]" target="status"><img src="[% webroot %]html/subtract.gif" border=0 align="center" width="8" height="8" onMouseOver="self.status='Delete List';return true"></a></nobr>
   </td>
+  	[% FOREACH mixer = mixerlinks.values.sort %]
+		[% PROCESS $mixer %]
+	[% END %]
   <td  class="listing" width="3" align="center">&nbsp;</td>
 </tr>
diff -upBr server/Plugins/MoodLogic/Plugin.pm Plugins/MoodLogic/Plugin.pm
--- server/Plugins/MoodLogic/Plugin.pm	2005-05-19 14:13:42.312500000 -0700
+++ Plugins/MoodLogic/Plugin.pm	2005-05-19 12:34:53.921875000 -0700
@@ -892,32 +892,15 @@ sub instant_mix {
 	for my $item (@$items) {
 
 		my %list_form = %$params;
-		my $webFormat = Slim::Utils::Prefs::getInd("titleFormat",Slim::Utils::Prefs::get("titleFormatWeb"));
-		
+		my $fieldInfo = Slim::Web::Pages::fieldInfo();
+
+		# If we can't get an object for this url, skip it, as the
+		# user's database is likely out of date. Bug 863
 		my $trackObj  = $ds->objectForUrl($item) || next;
 		
-		$list_form{'genre'}         = $genre;
-		$list_form{'player'}        = $player;
-		$list_form{'itempath'}      = $item; 
-		$list_form{'item'}          = $item;
-		$list_form{'itemobj'}       = $trackObj;
-		$list_form{'title'}         = Slim::Music::Info::infoFormat($item, $webFormat, 'TITLE');
-		$list_form{'includeArtist'} = ($webFormat !~ /ARTIST/);
-		$list_form{'includeAlbum'}  = ($webFormat !~ /ALBUM/) ;
-		$list_form{'odd'}           = ($itemnumber + 1) % 2;
-		$list_form{'album'}         = $list_form{'includeArtist'} ? $trackObj->album() : undef;
-		
-		if ($list_form{'includeArtist'} && $trackObj) {
+		my $itemname = &{$fieldInfo->{'track'}->{'resultToName'}}($trackObj);
+		&{$fieldInfo->{'track'}->{'listItem'}}($ds, \%list_form, $trackObj, $itemname, 0);
 
-			if (Slim::Utils::Prefs::get('composerInArtists') && $trackObj) {
-				if (my ($contributor) = $trackObj->contributors()) {
-					$list_form{'artist'}   = $contributor->name();
-					$list_form{'artistid'} = $contributor->id();
-				}
-			} else {
-				$list_form{'artist'} = $trackObj->artist();
-			}
-		}
 		$itemnumber++;
 
 		$params->{'instant_mix_list'} .= ${Slim::Web::HTTP::filltemplatefile("plugins/MoodLogic/instant_mix_list.html", \%list_form)};
diff -upBr server/Plugins/MusicMagic/HTML/Default/plugins/MusicMagic/mixerlink.html Plugins/MusicMagic/HTML/Default/plugins/MusicMagic/mixerlink.html
--- server/Plugins/MusicMagic/HTML/Default/plugins/MusicMagic/mixerlink.html	2005-05-19 14:13:42.687500000 -0700
+++ Plugins/MusicMagic/HTML/Default/plugins/MusicMagic/mixerlink.html	2005-05-19 13:49:32.187500000 -0700
@@ -1,4 +1,4 @@
 
 <td align="right" [% IF odd %]class="odd"[% END %] [% IF not odd %]class="even"[% END %]> 
-      <nobr><a href="plugins/MusicMagic/musicmagic_mix.html?song=[% itempath | uri %]&genre=[% genre | uri %]&artist=[% artist | uri %]&album=[% album | uri %]&player=[% player | uri %]"><img src="plugins/MusicMagic/html/images/b_mmmix.gif" width=13 height=13  alt="[% "MUSICMAGIC_MIX" | string %]" title="[% "MUSICMAGIC_MIX" | string %]"></a></nobr>
+      <nobr><a href="[% webroot %]plugins/MusicMagic/musicmagic_mix.html?song=[% itempath | uri %]&genre=[% genre | uri %]&artist=[% artist | uri %]&album=[% album | uri %]&player=[% player | uri %]"><img src="[% webroot %]plugins/MusicMagic/html/images/b_mmmix.gif" width=13 height=13  alt="[% "MUSICMAGIC_MIX" | string %]" title="[% "MUSICMAGIC_MIX" | string %]"></a></nobr>
  </td>
\ No newline at end of file
diff -upBr server/Plugins/MusicMagic/HTML/Default/plugins/MusicMagic/musicmagic_mix_list.html Plugins/MusicMagic/HTML/Default/plugins/MusicMagic/musicmagic_mix_list.html
--- server/Plugins/MusicMagic/HTML/Default/plugins/MusicMagic/musicmagic_mix_list.html	2005-05-19 14:13:42.468750000 -0700
+++ Plugins/MusicMagic/HTML/Default/plugins/MusicMagic/musicmagic_mix_list.html	2005-05-19 11:53:15.625000000 -0700
@@ -1,6 +1,6 @@
 <tr>
   <td width="100%" [% IF odd %]class="odd"[% END %] [% IF not odd %]class="even"[% END %]>
-      <a href="[% webroot %]songinfo.html?item=[% item %]&player=[% player | uri %]">[% title %]</a>
+      <a href="[% webroot %]songinfo.html?item=[% item %]&player=[% player | uri %]">[% text %]</a>
       [% IF includeAlbum && album  && album != noAlbum %][% "FROM" | string %]
       <i><a href="[% webroot %]browsedb.html?hierarchy=album,track&level=1&album=[% itemobj.album.id %]&player=[% player | uri %]" target="browser">[% album | html %]</a></i>[% END %]
       [% IF includeArtist && artist && artist != noArtist %][% "BY" | string %] 
@@ -13,4 +13,10 @@
 <td  align="right" width="13" [% IF odd %]class="odd"[% END %] [% IF not odd %]class="even"[% END %]>
       <nobr><a href="[% webroot %]status_header.html?p0=playlist&p1=append&p2=[% itempath | uri %]&player=[% player | uri %]" target="status"><img src="[% webroot %]html/images/b_add.gif" width=13 height=13 alt="[% "ADD_TO_PLAYLIST" | string %]" title="[% "ADD_TO_PLAYLIST" | string %]"></a></nobr>
   </td>
+[% FOREACH mixer = mixerlinks.values.sort %]
+
+	[% PROCESS $mixer %]
+
+[% END %]
+
 </tr>
Only in Plugins/MusicMagic/HTML/Default/plugins/MusicMagic: musicmagic_mix_list.html.rej
diff -upBr server/Plugins/MusicMagic/HTML/EN/plugins/MusicMagic/musicmagic_mix_list.html Plugins/MusicMagic/HTML/EN/plugins/MusicMagic/musicmagic_mix_list.html
--- server/Plugins/MusicMagic/HTML/EN/plugins/MusicMagic/musicmagic_mix_list.html	2005-05-19 14:13:42.453125000 -0700
+++ Plugins/MusicMagic/HTML/EN/plugins/MusicMagic/musicmagic_mix_list.html	2005-05-19 11:53:10.578125000 -0700
@@ -1,6 +1,6 @@
 <tr>
   <td [% IF odd %]class="odd" bgcolor="#d0d0d0"[% ELSE %]class="even" bgcolor="#FFFFFF"[% END %]>
-      <a href="[% webroot %]songinfo.html?item=[% item | uri %]&player=[% player | uri %]">[% title %]</a>
+      <a href="[% webroot %]songinfo.html?item=[% item | uri %]&player=[% player | uri %]">[% text %]</a>
       [% IF includeAlbum && album  && album != noAlbum %][% "FROM" | string %]
       <i><a href="[% webroot %]browsedb.html?hierarchy=album,track&level=1&album=[% itemobj.album.id %]&player=[% player | uri %]" target="browser">[% album | html %]</a></i>[% END %]
       [% IF includeArtist && artist && artist != noArtist %][% "BY" | string %] 
@@ -13,5 +13,8 @@
 <td  align="right" width="13" [% IF odd %]class="odd" bgcolor="#d0d0d0"[% ELSE %]class="even" bgcolor="#FFFFFF"[% END %]>
       <nobr><a href="[% webroot %]status_header.html?p0=playlist&p1=append&p2=[% itempath | uri %]&player=[% player | uri %]" target="status">[% "ADD_TO_PLAYLIST" | string %]</a></nobr>
   </td>
+	[% FOREACH mixer = mixerlinks.values.sort %]
+		[% PROCESS $mixer %]
+	[% END %]
 </tr>
 
Only in Plugins/MusicMagic/HTML/EN/plugins/MusicMagic: musicmagic_mix_list.html.rej
diff -upBr server/Plugins/MusicMagic/HTML/Fishbone/plugins/MusicMagic/musicmagic_mix_list.html Plugins/MusicMagic/HTML/Fishbone/plugins/MusicMagic/musicmagic_mix_list.html
--- server/Plugins/MusicMagic/HTML/Fishbone/plugins/MusicMagic/musicmagic_mix_list.html	2005-05-19 14:13:42.421875000 -0700
+++ Plugins/MusicMagic/HTML/Fishbone/plugins/MusicMagic/musicmagic_mix_list.html	2005-05-19 12:43:19.515625000 -0700
@@ -1,13 +1,12 @@
 <tr>
-	<td  class="listing">&nbsp;<nobr>
+	<td  class="listing">&nbsp;
 	[% IF anchor %]<a name="[% anchor %]"></a>[% END %]
-		<a href="[% webroot %]songinfo.html?item=[% item | uri %]&player=[% player | uri %]"><b>[% title %]</b></a>
+		<a href="[% webroot %]songinfo.html?item=[% item | uri %]&player=[% player | uri %]"><b>[% text %]</b></a>
 		[% IF includeArtist && artist && artist != noArtist %][% "BY" | string %] 
 		<a href="[% webroot %]browsedb.html?hierarchy=artist,album,track&level=1&artist=[% itemobj.contributorsOfType('artist').first.id %]&player=[% player | uri %]" target="browser">[% artist | html %]</a>[% END %]
 		[% IF includeAlbum && album  && album != noAlbum %][% "FROM" | string %]
 		<i><a href="[% webroot %]browsedb.html?hierarchy=album,track&level=1&album=[% itemobj.album.id %]&player=[% player | uri %]" target="browser">[% album | html %]</a></i>[% END %]
-
-  </nobr></td>
+  </td>
   <td  class="listing" width="11" align="center">
       <nobr><a href="[% webroot %]status_header.html?p0=playlist&p1=insert&p2=[% itempath | uri %]&player=[% player | uri %]" target="status"><img src="[% webroot %]html/queue.gif" border=0 align="center" width="6" height="9" onMouseOver="self.status='Queue This Item';return true"></a></nobr>
   </td>
@@ -23,6 +22,9 @@
   <td  class="listing" width="11" align="center">
       <nobr><a href="[% webroot %]status_header.html?p0=playlist&p1=deleteitem&p2=[% itempath | uri %]&player=[% player | uri %]" target="status"><img src="[% webroot %]html/subtract.gif" border=0 align="center" width="8" height="8" onMouseOver="self.status='Delete List';return true"></a></nobr>
   </td>
+	[% FOREACH mixer = mixerlinks.values.sort %]
+		[% PROCESS $mixer %]
+	[% END %]
   <td  class="listing" width="3" align="center">&nbsp;</td>
 </tr>
 
Only in Plugins/MusicMagic/HTML/Fishbone/plugins/MusicMagic: musicmagic_mix_list.html.orig
Only in Plugins/MusicMagic/HTML/Fishbone/plugins/MusicMagic: musicmagic_mix_list.html.rej
diff -upBr server/Plugins/MusicMagic/Plugin.pm Plugins/MusicMagic/Plugin.pm
--- server/Plugins/MusicMagic/Plugin.pm	2005-05-19 14:13:42.281250000 -0700
+++ Plugins/MusicMagic/Plugin.pm	2005-05-19 13:44:11.906250000 -0700
@@ -213,14 +213,14 @@ sub addGroups {
 sub isMusicLibraryFileChanged {
 
 	my $http = Slim::Player::Protocols::HTTP->new({
-		'url'    => "http://$MMSHost:$MMSport/api/cacheid?contentsOnly",
+		'url'    => "http://$MMSHost:$MMSport/api/cacheid?contents",
 		'create' => 0,
 		'timeout' => 5,
 	}) || return 0;
 
 	my $fileMTime = $http->content();
 	
-	$::d_musicmagic && msg("MusicMagic: read cacheid of $fileMTime\n");
+	$::d_musicmagic && msg("MusicMagic: read cacheid of $fileMTime");
 
 	$http = Slim::Player::Protocols::HTTP->new({
 		'url'    => "http://$MMSHost:$MMSport/api/getStatus",
@@ -230,7 +230,7 @@ sub isMusicLibraryFileChanged {
 	
 	my $MMMstatus = $http->content();
 	
-	$::d_musicmagic && msg("MusicMagic: got status - $MMMstatus\n");
+	$::d_musicmagic && msg("MusicMagic: got status - $MMMstatus");
 
 	$http->close();
 
@@ -247,7 +247,7 @@ sub isMusicLibraryFileChanged {
 
 		$::d_musicmagic && msg("MusicMagic: music library has changed!\n");
 		
-		$::d_musicmagic && msg("	Details: \n\t\tCacheid - $fileMTime\n\t\tLastCacheid - $oldTime\n\t\tReload Interval - $musicmagicscaninterval\n\t\tLast Scan - $lastMusicLibraryFinishTime\n");
+		$::d_musicmagic && msg("	Details: \n\t\tCacheid - $fileMTime\t\tLastCacheid - $oldTime\n\t\tReload Interval - $musicmagicscaninterval\n\t\tLast Scan - $lastMusicLibraryFinishTime\n");
 		
 		unless ($musicmagicscaninterval) {
 			
@@ -320,7 +320,7 @@ sub doneScanning {
 	Slim::Utils::Prefs::set('MMMlastMusicLibraryFinishTime',time());
 
 	my $http = Slim::Player::Protocols::HTTP->new({
-		'url'    => "http://$MMSHost:$MMSport/api/cacheid?contentsOnly",
+		'url'    => "http://$MMSHost:$MMSport/api/cacheid?contents",
 		'create' => 0,
 	}) || return 0;
 
@@ -661,7 +661,7 @@ sub exportFunction {
 			}
 		}
 		
-		# skipping to done here.  Duplicates currently crash the linux version of MusicMagic.
+		# skipping to done here.  Duplicates currently crash the linux version of MusicMagic 1.1.3.
 		if ($initialized !~ m/1\.1\.3$/) {
 			$export = 'duplicates';
 			return 1;
@@ -1062,38 +1062,18 @@ sub musicmagic_mix {
 	for my $item (@$mix) {
 
 		my %list_form = %$params;
-		my $webFormat = Slim::Utils::Prefs::getInd("titleFormat",Slim::Utils::Prefs::get("titleFormatWeb"));
+		my $fieldInfo = Slim::Web::Pages::fieldInfo();
 
 		# If we can't get an object for this url, skip it, as the
 		# user's database is likely out of date. Bug 863
 		my $trackObj  = $ds->objectForUrl($item) || next;
 		
-		$list_form{'genre'}         = $genre;
-		$list_form{'player'}        = $player;
-		$list_form{'itempath'}      = $item; 
-		$list_form{'item'}          = $trackObj->id; 
-		$list_form{'itemobj'}       = $trackObj;
-		$list_form{'title'}         = Slim::Music::Info::infoFormat($trackObj, $webFormat, 'TITLE');
-		$list_form{'includeArtist'} = ($webFormat !~ /ARTIST/);
-		$list_form{'includeAlbum'}  = ($webFormat !~ /ALBUM/) ;
-		$list_form{'odd'}           = ($itemnumber + 1) % 2;
-		$list_form{'album'}         = $list_form{'includeArtist'} ? $trackObj->album() : undef;
-		
-		if ($list_form{'includeArtist'} && $trackObj) {
-
-			if ($composerIn) {
-				if (my ($contributor) = $trackObj->contributors()) {
-					$list_form{'artist'}   = $contributor->name();
-					$list_form{'artistid'} = $contributor->id();
-				}
-			} else {
-				$list_form{'artist'} = $trackObj->artist();
-			}
-		}
+		my $itemname = &{$fieldInfo->{'track'}->{'resultToName'}}($trackObj);
+		&{$fieldInfo->{'track'}->{'listItem'}}($ds, \%list_form, $trackObj, $itemname, 0);
 
 		$itemnumber++;
 
-		$params->{'mix_list'} .= ${Slim::Web::HTTP::filltemplatefile("plugins/MusicMagic/musicmagic_mix_list.html", \%list_form)};
+		$params->{'mix_list'} .= ${Slim::Web::HTTP::filltemplatefile("browsedb_list.html", \%list_form)};
 	}
 
 	if (defined $p0 && defined $client) {
diff -upBr server/HTML/Default/browsedb_list.html HTML/Default/browsedb_list.html
--- server/HTML/Default/browsedb_list.html	2005-05-19 14:13:42.640625000 -0700
+++ HTML/Default/browsedb_list.html	2005-05-19 13:48:23.750000000 -0700
@@ -6,31 +6,31 @@
 
 [% IF descend %]
 
-	<a href="browsedb.html?hierarchy=[% hierarchy %]&level=[% level %][% attributes %]&player=[% player | uri %]">[% text | html %][% IF showYear && year %] ([% year %])[% END %]</a>
+	<a href="[% webroot %]browsedb.html?hierarchy=[% hierarchy %]&level=[% level %][% attributes %]&player=[% player | uri %]">[% text | html %][% IF showYear && year %] ([% year %])[% END %]</a>
 
 	<!-- Include the artist for the album view -->
 	[% IF level == 1 && includeArtist && artist %]
 
 		[% "BY" | string %]
-		<a href="browsedb.html?hierarchy=artist,album,track&level=1&artist=[% artist.id %]&player=[% player | uri %]" target="browser">[% artist.name | html %]</a></i>
+		<a href="[% webroot %]browsedb.html?hierarchy=artist,album,track&level=1&artist=[% artist.id %]&player=[% player | uri %]" target="browser">[% artist.name | html %]</a></i>
 
 	[% END %]
 
 [% ELSE %]
 
-	<a href="songinfo.html?[% IF item %]item=[% item %][% ELSE %]itempath=[% itempath | uri %][% END %]&player=[% player | uri %]">[% text | html %][% IF showYear && year %] ([% year %])[% END %]</a>
+	<a href="[% webroot %]songinfo.html?[% IF item %]item=[% item %][% ELSE %]itempath=[% itempath | uri %][% END %]&player=[% player | uri %]">[% text | html %][% IF showYear && year %] ([% year %])[% END %]</a>
 
 	[% IF includeAlbum && album %]
 
 		[% "FROM" | string %]
-		<i><a href="browsedb.html?hierarchy=album,track&level=1&album=[% itemobj.album.id %]&player=[% player | uri %]" target="browser">[% album | html %]</a></i>
+		<i><a href="[% webroot %]browsedb.html?hierarchy=album,track&level=1&album=[% itemobj.album.id %]&player=[% player | uri %]" target="browser">[% album | html %]</a></i>
 
 	[% END %]
 
 	[% IF includeArtist && artist %]
 
 		[% "BY" | string %]
-		<a href="browsedb.html?hierarchy=artist,album,track&level=1&artist=[% itemobj.contributorsOfType('artist').first.id %]&player=[% player | uri %]" target="browser">[% artist | html %]</a></i>
+		<a href="[% webroot %]browsedb.html?hierarchy=artist,album,track&level=1&artist=[% itemobj.contributorsOfType('artist').first.id %]&player=[% player | uri %]" target="browser">[% artist | html %]</a></i>
 
 	[% END %]
 
@@ -39,13 +39,13 @@
  </td>
 
 <td align="right" width="13" [% IF odd %]class="odd"[% END %] [% IF not odd %]class="even"[% END %]>
-      [% IF descend %]<nobr><a href="status_header.html?command=playlist&subcommand=loadtracks[% attributes %]&player=[% player | uri %]" target="status"><img src="html/images/b_play.gif" width=13 height=13 alt="[% "PLAY" | string %]" title="[% "PLAY" | string %]"></a></nobr> [% END %]
-      [% IF not descend %]<nobr><a href="status_header.html?p0=playlist&p1=play&p2=[% itempath | uri %]&player=[% player | uri %]" target="status"><img src="html/images/b_play.gif" width=13 height=13 alt="[% "PLAY" | string %]" title="[% "PLAY" | string %]"></a></nobr> [% END %]
+      [% IF descend %]<nobr><a href="[% webroot %]status_header.html?command=playlist&subcommand=loadtracks[% attributes %]&player=[% player | uri %]" target="status"><img src="[% webroot %]html/images/b_play.gif" width=13 height=13 alt="[% "PLAY" | string %]" title="[% "PLAY" | string %]"></a></nobr> [% END %]
+      [% IF not descend %]<nobr><a href="[% webroot %]status_header.html?p0=playlist&p1=play&p2=[% itempath | uri %]&player=[% player | uri %]" target="status"><img src="[% webroot %]html/images/b_play.gif" width=13 height=13 alt="[% "PLAY" | string %]" title="[% "PLAY" | string %]"></a></nobr> [% END %]
 </td>
 
 <td align="right" width="13" [% IF odd %]class="odd"[% END %] [% IF not odd %]class="even"[% END %]>
-      [% IF descend %]<nobr><a href="status_header.html?command=playlist&subcommand=addtracks[% attributes %]&player=[% player | uri %]" target="status"><img src="html/images/b_add.gif" width=13 height=13 alt="[% "ADD_TO_PLAYLIST" | string %]" title="[% "ADD_TO_PLAYLIST" | string %]"></a></nobr> [% END %]
-      [% IF not descend %]<nobr><a href="status_header.html?p0=playlist&p1=append&p2=[% itempath | uri %]&player=[% player | uri %]" target="status"><img src="html/images/b_add.gif" width=13 height=13 alt="[% "ADD_TO_PLAYLIST" | string %]" title="[% "ADD_TO_PLAYLIST" | string %]"></a></nobr> [% END %]
+      [% IF descend %]<nobr><a href="[% webroot %]status_header.html?command=playlist&subcommand=addtracks[% attributes %]&player=[% player | uri %]" target="status"><img src="[% webroot %]html/images/b_add.gif" width=13 height=13 alt="[% "ADD_TO_PLAYLIST" | string %]" title="[% "ADD_TO_PLAYLIST" | string %]"></a></nobr> [% END %]
+      [% IF not descend %]<nobr><a href="[% webroot %]status_header.html?p0=playlist&p1=append&p2=[% itempath | uri %]&player=[% player | uri %]" target="status"><img src="[% webroot %]html/images/b_add.gif" width=13 height=13 alt="[% "ADD_TO_PLAYLIST" | string %]" title="[% "ADD_TO_PLAYLIST" | string %]"></a></nobr> [% END %]
 </td>
 
 [% FOREACH mixer = mixerlinks.values.sort %]
diff -upBr server/HTML/Default2/browsedb_list.html HTML/Default2/browsedb_list.html
--- server/HTML/Default2/browsedb_list.html	2005-05-19 14:13:42.734375000 -0700
+++ HTML/Default2/browsedb_list.html	2005-05-19 14:03:57.515625000 -0700
@@ -29,9 +29,9 @@
  </td>
  <td class="browselistbuttons">
   <img width="13" alt="Play" onclick="parent.updateStatusCombined(&quot;&amp;command=playlist&amp;subcommand=loadtracks[%IF
-  descend; attributes|html; ELSE %]&amp;track=[% item; END %]&quot;)" src="html/images/b/b_play.gif" height="13"/><img
+  descend; attributes|html; ELSE %]&amp;track=[% item; END %]&quot;)" src="[% webroot %]html/images/b/b_play.gif" height="13"/><img
   alt="Add" onclick="parent.updateStatusCombined(&quot;&amp;command=playlist&amp;subcommand=addtracks[% IF descend;
-  attributes|html; ELSE %]&amp;track=[% item; END %]&quot;)" src="html/images/b/b_add.gif" width="13" height="13"/>
+  attributes|html; ELSE %]&amp;track=[% item; END %]&quot;)" src="[% webroot %]html/images/b/b_add.gif" width="13" height="13"/>
  </td>
  [% FOREACH mixer = mixerlinks.values.sort ; PROCESS $mixer ; END %]
 </tr>
diff -upBr server/HTML/EN/browsedb_list.html HTML/EN/browsedb_list.html
--- server/HTML/EN/browsedb_list.html	2005-05-19 14:13:42.703125000 -0700
+++ HTML/EN/browsedb_list.html	2005-05-19 13:52:17.750000000 -0700
@@ -5,27 +5,27 @@
 
 [% IF descend %]
 
-	<a href="browsedb.html?hierarchy=[% hierarchy %]&level=[% level %][% attributes %]&player=[% player | uri %]">[% text | html %]</a>
+	<a href="[% webroot %]browsedb.html?hierarchy=[% hierarchy %]&level=[% level %][% attributes %]&player=[% player | uri %]">[% text | html %]</a>
 
 	<!-- Include the artist for the album view -->
 	[% IF level == 1 && includeArtist && artist %]
 	 
 		[% "BY" | string %]
-		<a href="browsedb.html?hierarchy=artist,album,track&level=1&artist=[% artist.id %]&player=[% player | uri %]" target="browser">[% artist.name | html %]</a></i>
+		<a href="[% webroot %]browsedb.html?hierarchy=artist,album,track&level=1&artist=[% artist.id %]&player=[% player | uri %]" target="browser">[% artist.name | html %]</a></i>
 
 	[% END %]
 
 [% ELSE %]
 
-	<a href="songinfo.html?item=[% item %]&player=[% player | uri %]">[% text | html %][% IF year %] ([% year %])[% END %]</a>
+	<a href="[% webroot %]songinfo.html?item=[% item %]&player=[% player | uri %]">[% text | html %][% IF year %] ([% year %])[% END %]</a>
 
 	[% IF includeAlbum && album %][% "FROM" | string %]
-        	<i><a href="browsedb.html?hierarchy=album,track&level=1&album=[% itemobj.album.id %]&player=[% player | uri %]" target="browser">[% album | html %]</a></i>
+        	<i><a href="[% webroot %]browsedb.html?hierarchy=album,track&level=1&album=[% itemobj.album.id %]&player=[% player | uri %]" target="browser">[% album | html %]</a></i>
 	[% END %]
 
 	[% IF includeArtist && artist %][% "BY" | string %]
 
-        	<a href="browsedb.html?hierarchy=artist,album,track&level=1&artist=[% itemobj.contributorsOfType('artist').first.id %]&player=[% player | uri %]" target="browser">[% artist | html %]</a></i>
+        	<a href="[% webroot %]browsedb.html?hierarchy=artist,album,track&level=1&artist=[% itemobj.contributorsOfType('artist').first.id %]&player=[% player | uri %]" target="browser">[% artist | html %]</a></i>
 	[% END %]
 
 [% END %]
@@ -34,10 +34,10 @@
 <td [% IF odd %]class="odd" bgcolor="#d0d0d0"[% END %] [% IF not odd %]class="even" bgcolor="#FFFFFF"[% END %]>
 
 [% IF descend %]
-	<nobr><a href="status.html?command=playlist&subcommand=loadtracks[% attributes %]&player=[% player | uri %]" target="status">[% "PLAY" | string %]</a></nobr>
+	<nobr><a href="[% webroot %]status.html?command=playlist&subcommand=loadtracks[% attributes %]&player=[% player | uri %]" target="status">[% "PLAY" | string %]</a></nobr>
 
 [% ELSE %]
-	<nobr><a href="status.html?p0=playlist&p1=play&p2=[% itempath | uri %]&player=[% player | uri %]" target="status">[% "PLAY" | string %]</a></nobr>
+	<nobr><a href="[% webroot %]status.html?p0=playlist&p1=play&p2=[% itempath | uri %]&player=[% player | uri %]" target="status">[% "PLAY" | string %]</a></nobr>
 [% END %]
 
 </td>
@@ -45,11 +45,11 @@
 
 [% IF descend %]
 
-	<nobr><a href="status.html?command=playlist&subcommand=addtracks[% attributes %]&player=[% player | uri %]" target="status">[% FILTER nbsp %][% "ADD_TO_PLAYLIST" | string %][% END %]</a></nobr>
+	<nobr><a href="[% webroot %]status.html?command=playlist&subcommand=addtracks[% attributes %]&player=[% player | uri %]" target="status">[% FILTER nbsp %][% "ADD_TO_PLAYLIST" | string %][% END %]</a></nobr>
 
 [% ELSE %]
 
-	<nobr><a href="status.html?p0=playlist&p1=append&p2=[% itempath | uri %]&player=[% player | uri %]" target="status">[% FILTER nbsp %][% "ADD_TO_PLAYLIST" | string %][% END %]</a></nobr>
+	<nobr><a href="[% webroot %]status.html?p0=playlist&p1=append&p2=[% itempath | uri %]&player=[% player | uri %]" target="status">[% FILTER nbsp %][% "ADD_TO_PLAYLIST" | string %][% END %]</a></nobr>
 
 [% END %]
 
diff -upBr server/HTML/Fishbone/browsedb_list.html HTML/Fishbone/browsedb_list.html
--- server/HTML/Fishbone/browsedb_list.html	2005-05-19 14:13:42.609375000 -0700
+++ HTML/Fishbone/browsedb_list.html	2005-05-19 13:46:46.125000000 -0700
@@ -3,44 +3,44 @@
 		[% IF anchor %]<a name="[% anchor %]"></a>[% END %]
 
 		[% IF coverThumb %]
-			<a href="browsedb.html?hierarchy=[% hierarchy %]&level=[% level %][% attributes %]&player=[% player | uri %]" target="browser"><img src="/music/[% coverThumb %]/thumb.jpg" border="0" height="[% size %]" width="[% size %]" alt="[% item | html %][% IF artist %] [% "BY" | string %] [% artist %][% END %][% IF year %] ([% year %])[% END %]" title="[% item | html %][% IF artist %] [% "BY" | string %] [% artist %][% END %][% IF year %] ([% year %])[% END %]"></a>
+			<a href="[% webroot %]browsedb.html?hierarchy=[% hierarchy %]&level=[% level %][% attributes %]&player=[% player | uri %]" target="browser"><img src="/music/[% coverThumb %]/thumb.jpg" border="0" height="[% size %]" width="[% size %]" alt="[% item | html %][% IF artist %] [% "BY" | string %] [% artist %][% END %][% IF year %] ([% year %])[% END %]" title="[% item | html %][% IF artist %] [% "BY" | string %] [% artist %][% END %][% IF year %] ([% year %])[% END %]"></a>
 		[% END %]
 		
-		[% IF descend %]<a href="browsedb.html?hierarchy=[% hierarchy %]&level=[% level %][% attributes %]&player=[% player | uri %]">[% text | html %][% IF showYear && year %] ([% year %])[% END %]</a>
+		[% IF descend %]<a href="[% webroot %]browsedb.html?hierarchy=[% hierarchy %]&level=[% level %][% attributes %]&player=[% player | uri %]">[% text | html %][% IF showYear && year %] ([% year %])[% END %]</a>
 
 		<!-- Include the artist for the album view -->
 		[% IF level == 1 && includeArtist && artist %]
 		 
 			[% "BY" | string %]
-			<a href="browsedb.html?hierarchy=artist,album,track&level=1&artist=[% artist.id %]&player=[% player | uri %]">[% artist.name | html %]</a></i>
+			<a href="[% webroot %]browsedb.html?hierarchy=artist,album,track&level=1&artist=[% artist.id %]&player=[% player | uri %]">[% artist.name | html %]</a></i>
 		[% END %]
 
-		[% ELSE %]<b><a href="songinfo.html?[% IF item %]item=[% item %][% ELSE %]itempath=[% itempath | uri %][% END %]&player=[% player | uri %]">[% text | html %][% IF showYear && year %] ([% year %])[% END %]</a></b>
+		[% ELSE %]<b><a href="[% webroot %]songinfo.html?[% IF item %]item=[% item %][% ELSE %]itempath=[% itempath | uri %][% END %]&player=[% player | uri %]">[% text | html %][% IF showYear && year %] ([% year %])[% END %]</a></b>
 
 			[% IF includeArtist && artist && artist != noArtist %][% "BY" | string %] 
-			<a href="browsedb.html?hierarchy=artist,album,track&level=1&artist=[% itemobj.contributorsOfType('artist').first.id %]&player=[% player | uri %]" target="browser">[% artist | html %]</a>[% END %]
+			<a href="[% webroot %]browsedb.html?hierarchy=artist,album,track&level=1&artist=[% itemobj.contributorsOfType('artist').first.id %]&player=[% player | uri %]" target="browser">[% artist | html %]</a>[% END %]
 			[% IF includeAlbum && album  && album != noAlbum %][% "FROM" | string %]
-			<i><a href="browsedb.html?hierarchy=album,track&level=1&album=[% itemobj.album.id %]&player=[% player | uri %]" target="browser">[% album | html %]</a></i>[% END %]
+			<i><a href="[% webroot %]browsedb.html?hierarchy=album,track&level=1&album=[% itemobj.album.id %]&player=[% player | uri %]" target="browser">[% album | html %]</a></i>[% END %]
 		[% END %]
 	</td>
 	<td class="listing" width="11" align="center">
-		[% IF descend %]<nobr><a href="status_header.html?command=playlist&subcommand=inserttracks[% attributes | html %]&player=[% player | uri %]" target="status"><img src="html/queue.gif" border=0 align="center" width="6" height="9" alt='Queue' title='[% "ADD_TO_PLAYLIST" | string %] [% "NEXT" | string %]' onMouseOver="self.status='[% "ADD_TO_PLAYLIST" | string %] [% "NEXT" | string %]';return true"></a></nobr>[% END %]
-		[% IF not descend %]<nobr><a href="status_header.html?p0=playlist&p1=insert&p2=[% itempath | uri %]&player=[% player | uri %]" target="status"><img src="html/queue.gif" border=0 align="center" width="6" height="9" alt='Queue' title='[% "ADD_TO_PLAYLIST" | string %] [% "NEXT" | string %]' onMouseOver="self.status='[% "ADD_TO_PLAYLIST" | string %] [% "NEXT" | string %]';return true"></a></nobr>[% END %]
+		[% IF descend %]<nobr><a href="[% webroot %]status_header.html?command=playlist&subcommand=inserttracks[% attributes | html %]&player=[% player | uri %]" target="status"><img src="[% webroot %]html/queue.gif" border=0 align="center" width="6" height="9" alt='Queue' title='[% "ADD_TO_PLAYLIST" | string %] [% "NEXT" | string %]' onMouseOver="self.status='[% "ADD_TO_PLAYLIST" | string %] [% "NEXT" | string %]';return true"></a></nobr>[% END %]
+		[% IF not descend %]<nobr><a href="[% webroot %]status_header.html?p0=playlist&p1=insert&p2=[% itempath | uri %]&player=[% player | uri %]" target="status"><img src="[% webroot %]html/queue.gif" border=0 align="center" width="6" height="9" alt='Queue' title='[% "ADD_TO_PLAYLIST" | string %] [% "NEXT" | string %]' onMouseOver="self.status='[% "ADD_TO_PLAYLIST" | string %] [% "NEXT" | string %]';return true"></a></nobr>[% END %]
 	</td>
 	<td class="listing" width="3" align="center">&nbsp;</td>
 	<td class="listing" width="11" align="center">
-		[% IF descend %]<nobr><a href="status_header.html?command=playlist&subcommand=loadtracks[% attributes | html %]&player=[% player | uri %]"  target="status"><img src="html/play.this.gif" border=0 align="center" width="5" height="9"  alt='Play' title='[% "PLAY" | string %]' onMouseOver="self.status='[% "PLAY" | string %]';return true"></a></nobr>[% END %]
-		[% IF not descend %]<nobr><a href="status_header.html?p0=playlist&p1=play&p2=[% itempath | uri %]&player=[% player | uri %]" target="status"><img src="html/play.this.gif" border=0 align="center" width="5" height="9"  alt='Play' title='[% "PLAY" | string %]' onMouseOver="self.status='[% "PLAY" | string %]';return true"></a></nobr>[% END %]
+		[% IF descend %]<nobr><a href="[% webroot %]status_header.html?command=playlist&subcommand=loadtracks[% attributes | html %]&player=[% player | uri %]"  target="status"><img src="[% webroot %]html/play.this.gif" border=0 align="center" width="5" height="9"  alt='Play' title='[% "PLAY" | string %]' onMouseOver="self.status='[% "PLAY" | string %]';return true"></a></nobr>[% END %]
+		[% IF not descend %]<nobr><a href="[% webroot %]status_header.html?p0=playlist&p1=play&p2=[% itempath | uri %]&player=[% player | uri %]" target="status"><img src="[% webroot %]html/play.this.gif" border=0 align="center" width="5" height="9"  alt='Play' title='[% "PLAY" | string %]' onMouseOver="self.status='[% "PLAY" | string %]';return true"></a></nobr>[% END %]
 	</td>
 	<td class="listing" width="3" align="center">&nbsp;</td>
 	<td class="listing" width="11" align="center">
-		[% IF descend %]<nobr><a href="status_header.html?command=playlist&subcommand=addtracks[% attributes | html %]&player=[% player | uri %]" target="status"><img src="html/add.gif" border=0 align="center" width="8" height="8" alt='Add' title='[% "ADD_TO_PLAYLIST" | string %]' onMouseOver="self.status='[% "ADD_TO_PLAYLIST" | string %]';return true"></a></nobr>[% END %]
-		[% IF not descend %]<nobr><a href="status_header.html?p0=playlist&p1=append&p2=[% itempath | uri %]&player=[% player | uri %]" target="status"><img src="html/add.gif" border=0 align="center" width="8" height="8" alt='Add' title='[% "ADD_TO_PLAYLIST" | string %]' onMouseOver="self.status='[% "ADD_TO_PLAYLIST" | string %]';return true"></a></nobr>[% END %]
+		[% IF descend %]<nobr><a href="[% webroot %]status_header.html?command=playlist&subcommand=addtracks[% attributes | html %]&player=[% player | uri %]" target="status"><img src="[% webroot %]html/add.gif" border=0 align="center" width="8" height="8" alt='Add' title='[% "ADD_TO_PLAYLIST" | string %]' onMouseOver="self.status='[% "ADD_TO_PLAYLIST" | string %]';return true"></a></nobr>[% END %]
+		[% IF not descend %]<nobr><a href="[% webroot %]status_header.html?p0=playlist&p1=append&p2=[% itempath | uri %]&player=[% player | uri %]" target="status"><img src="[% webroot %]html/add.gif" border=0 align="center" width="8" height="8" alt='Add' title='[% "ADD_TO_PLAYLIST" | string %]' onMouseOver="self.status='[% "ADD_TO_PLAYLIST" | string %]';return true"></a></nobr>[% END %]
 	</td>
 	<td class="listing" width="3" align="center">&nbsp;</td>
 	<td class="listing" width="11" align="center">
-		[% IF descend %]<nobr><a href="status_header.html?command=playlist&subcommand=deletetracks[% attributes | html %]&player=[% player | uri %]" target="status"><img src="html/subtract.gif" border=0 align="center" width="8" height="8" alt='Delete' title='[% "REMOVE_FROM_PLAYLIST" | string %]' onMouseOver="self.status='[% "REMOVE_FROM_PLAYLIST" | string %]';return true"></a></nobr>[% END %]
-		[% IF not descend %]<nobr><a href="status_header.html?p0=playlist&p1=deleteitem&p2=[% itempath | uri %]&player=[% player | uri %]" target="status"><img src="html/subtract.gif" border=0 align="center" width="8" height="8" alt='Delete' title='[% "REMOVE_FROM_PLAYLIST" | string %]' onMouseOver="self.status='[% "REMOVE_FROM_PLAYLIST" | string %]';return true"></a></nobr>[% END %]
+		[% IF descend %]<nobr><a href="[% webroot %]status_header.html?command=playlist&subcommand=deletetracks[% attributes | html %]&player=[% player | uri %]" target="status"><img src="[% webroot %]html/subtract.gif" border=0 align="center" width="8" height="8" alt='Delete' title='[% "REMOVE_FROM_PLAYLIST" | string %]' onMouseOver="self.status='[% "REMOVE_FROM_PLAYLIST" | string %]';return true"></a></nobr>[% END %]
+		[% IF not descend %]<nobr><a href="[% webroot %]status_header.html?p0=playlist&p1=deleteitem&p2=[% itempath | uri %]&player=[% player | uri %]" target="status"><img src="[% webroot %]html/subtract.gif" border=0 align="center" width="8" height="8" alt='Delete' title='[% "REMOVE_FROM_PLAYLIST" | string %]' onMouseOver="self.status='[% "REMOVE_FROM_PLAYLIST" | string %]';return true"></a></nobr>[% END %]
 	</td>
 	[% FOREACH mixer = mixerlinks.values.sort %]
 		[% PROCESS $mixer %]