yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't prepend root to path when path starts with root

Browse Source
This commit is contained in:
Benjamin Carleski
2020-11-19 03:07:05 -08:00
parent ff8edd3bf9
commit 42f4fdf8c8
3 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Umbraco.Web.Common/AspNetCore/AspNetCoreHostingEnvironment.cs
View File

@@ -79,16 +79,13 @@ namespace Umbraco.Web.Common.AspNetCore
}
}
public string MapPathWebRoot(string path)
{
var newPath = path.TrimStart('~', '/').Replace('/', Path.DirectorySeparatorChar).Replace('\\', Path.DirectorySeparatorChar);
return Path.Combine(_webHostEnvironment.WebRootPath, newPath);
}
public string MapPathWebRoot(string path) => MapPath(_webHostEnvironment.WebRootPath, path);
public string MapPathContentRoot(string path) => MapPath(_webHostEnvironment.ContentRootPath, path);
public string MapPathContentRoot(string path)
private string MapPath(string root, string path)
{
var newPath = path.TrimStart('~', '/').Replace('/', Path.DirectorySeparatorChar).Replace('\\', Path.DirectorySeparatorChar);
return Path.Combine(_webHostEnvironment.ContentRootPath, newPath);
var newPath = path.Replace('/', Path.DirectorySeparatorChar).Replace('\\', Path.DirectorySeparatorChar);
return newPath.StartsWith(root) ? newPath : Path.Combine(root, newPath.TrimStart('~', '/'));
}
public string ToAbsolute(string virtualPath)