[Slim-Checkins] r10910 - in /trunk/server/Slim: Utils/PluginManager.pm Web/HTTP.pm

[dsully at svn.slimdevices.com]

Author: dsully
Date: Thu Dec  7 15:16:44 2006
New Revision: 10910

URL: http://svn.slimdevices.com?rev=10910&view=rev
Log:
Bug: N/A
Description: Don't add non-existent include paths.

Modified:
    trunk/server/Slim/Utils/PluginManager.pm
    trunk/server/Slim/Web/HTTP.pm

Modified: trunk/server/Slim/Utils/PluginManager.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Utils/PluginManager.pm?rev=10910&r1=10909&r2=10910&view=diff
==============================================================================
--- trunk/server/Slim/Utils/PluginManager.pm (original)
+++ trunk/server/Slim/Utils/PluginManager.pm Thu Dec  7 15:16:44 2006
@@ -213,7 +213,7 @@
 
 				my $htmldir = catdir($plugindir, $path, "HTML");
 
-				if (-r $htmldir) {
+				if (-d $htmldir) {
 
 					Slim::Web::HTTP::addTemplateDirectory($htmldir);
 				}

Modified: trunk/server/Slim/Web/HTTP.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Web/HTTP.pm?rev=10910&r1=10909&r2=10910&view=diff
==============================================================================
--- trunk/server/Slim/Web/HTTP.pm (original)
+++ trunk/server/Slim/Web/HTTP.pm Thu Dec  7 15:16:44 2006
@@ -2008,7 +2008,11 @@
 
 		foreach my $rootDir (HTMLTemplateDirs()) {
 
-			push @include_path, catdir($rootDir, $dir);
+			my $skinDir = catdir($rootDir, $dir);
+
+			if (-d $skinDir) {
+				push @include_path, $skinDir;
+			}
 		}
 	}