[Slim-Checkins] r10920 - /branches/6.5/server/Plugins/iTunes/Common.pm

[dsully at svn.slimdevices.com]

Author: dsully
Date: Sat Dec  9 16:07:58 2006
New Revision: 10920

URL: http://svn.slimdevices.com?rev=10920&view=rev
Log:
Bug: 4573
Description: Merge from trunk -r 10918:10919

Modified:
    branches/6.5/server/Plugins/iTunes/Common.pm

Modified: branches/6.5/server/Plugins/iTunes/Common.pm
URL: http://svn.slimdevices.com/branches/6.5/server/Plugins/iTunes/Common.pm?rev=10920&r1=10919&r2=10920&view=diff
==============================================================================
--- branches/6.5/server/Plugins/iTunes/Common.pm (original)
+++ branches/6.5/server/Plugins/iTunes/Common.pm Sat Dec  9 16:07:58 2006
@@ -283,7 +283,11 @@
 		my $base = Slim::Utils::Misc::fileURLFromPath($explicit_path);
 
 		$url = $stripped;
-		$url =~ s/$class->iTunesLibraryBasePath/$base/isg;
+		
+		my $itunesbase = $class->iTunesLibraryBasePath;
+		
+		$url =~ s/$itunesbase/$base/isg;
+		
 		$url =~ s/(\w)\/\/(\w)/$1\/$2/isg;
 
 	} else {
@@ -319,7 +323,7 @@
 }
 
 sub checkDefaults {
-	my $class = shift;;
+	my $class = shift;
 
 	if (!Slim::Utils::Prefs::isDefined('itunesscaninterval')) {