aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.WebDashboard/Api/PackageCreator.cs
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2015-07-08 12:10:34 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2015-07-08 12:10:34 -0400
commit0291df3193f6fd23806a6ec1e87bf1aa7ed49c25 (patch)
treeafc3c6c48119ea644f6111e2c3686e3aae3db637 /MediaBrowser.WebDashboard/Api/PackageCreator.cs
parentdfa17aec70652d8a21d43c889f08f8c0fd805d09 (diff)
3.0.5666.2
Diffstat (limited to 'MediaBrowser.WebDashboard/Api/PackageCreator.cs')
-rw-r--r--MediaBrowser.WebDashboard/Api/PackageCreator.cs11
1 files changed, 10 insertions, 1 deletions
diff --git a/MediaBrowser.WebDashboard/Api/PackageCreator.cs b/MediaBrowser.WebDashboard/Api/PackageCreator.cs
index 0cd22baa9..c50f98c33 100644
--- a/MediaBrowser.WebDashboard/Api/PackageCreator.cs
+++ b/MediaBrowser.WebDashboard/Api/PackageCreator.cs
@@ -124,6 +124,15 @@ namespace MediaBrowser.WebDashboard.Api
var fullPath = Path.Combine(rootPath, virtualPath.Replace('/', Path.DirectorySeparatorChar));
+ try
+ {
+ fullPath = Path.GetFullPath(fullPath);
+ }
+ catch (Exception ex)
+ {
+ _logger.ErrorException("Error in Path.GetFullPath", ex);
+ }
+
// Don't allow file system access outside of the source folder
if (!_fileSystem.ContainsSubPath(rootPath, fullPath))
{
@@ -654,7 +663,7 @@ namespace MediaBrowser.WebDashboard.Api
await AppendResource(memoryStream, "thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.theme.min.css", newLineBytes).ConfigureAwait(false);
await AppendResource(memoryStream, "thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.structure.min.css", newLineBytes).ConfigureAwait(false);
-
+
var files = new[]
{
"css/site.css",