Index: Slim/Music/Info.pm
===================================================================
RCS file: /cvsroot/slim/server/Slim/Music/Info.pm,v
retrieving revision 1.140
diff -u -r1.140 Info.pm
--- Slim/Music/Info.pm	11 Aug 2004 15:43:15 -0000	1.140
+++ Slim/Music/Info.pm	12 Aug 2004 23:18:11 -0000
@@ -2128,9 +2128,6 @@
 				$::d_info && Slim::Utils::Misc::msg("readTags: calculating header $header, startbytes $startbytes and endbytes $endbytes\n");
 			}
 
-			# cache the content type
-			$tempCacheEntry->{'CT'} = $type;
-
 			if (! Slim::Music::iTunes::useiTunesLibrary()) {
 				# Check for Cover Artwork, only if not already present.
 				if (exists $tempCacheEntry->{'COVER'} || exists $tempCacheEntry->{'THUMB'}) {
Index: Slim/Music/Info.pm
===================================================================
RCS file: /cvsroot/slim/server/Slim/Music/Info.pm,v
retrieving revision 1.140
diff -u -r1.140 Info.pm
--- Slim/Music/Info.pm	11 Aug 2004 15:43:15 -0000	1.140
+++ Slim/Music/Info.pm	12 Aug 2004 22:18:49 -0000
@@ -2426,7 +2426,7 @@
 	}
 	if (defined($artwork) && $artwork =~ /^%(.*?)(\..*?){0,1}$/) {
 		my $suffix = $2 ? $2 : ".jpg";
-		$artwork = infoFormat(Slim::Utils::Misc::fileURLFromPath($file), $1)."$suffix";
+		$artwork = infoFormat(Slim::Utils::Misc::fileURLFromPath($fullpath), $1)."$suffix";
 		my $artworktype = $image eq 'thumb' ? "Thumbnail" : "Cover";
 		$::d_artwork && Slim::Utils::Misc::msg("Variable $artworktype: $artwork from $1\n");
 		my $artpath = catdir(@components, $artwork);