lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-12-02 19:44:02 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

#18630: Fixing image publication on Azure

Browse Source 
Work Item: 18630

--HG--
branch : 1.x
This commit is contained in:
Sebastien Ros
2012-04-25 16:00:38 -07:00
parent 74322902ec
commit 12e54a5ab6
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Orchard/Mvc/Extensions/UrlHelperExtensions.cs
View File

@@ -25,6 +25,10 @@ namespace Orchard.Mvc.Extensions {
} }
public static string MakeAbsolute(this UrlHelper urlHelper, string url, string baseUrl = null) { public static string MakeAbsolute(this UrlHelper urlHelper, string url, string baseUrl = null) {
if(url.StartsWith("http", StringComparison.OrdinalIgnoreCase)) {
return url;
}
if(String.IsNullOrEmpty(baseUrl)) { if(String.IsNullOrEmpty(baseUrl)) {
baseUrl = urlHelper.RequestContext.HttpContext.Request.ToApplicationRootUrlString(); baseUrl = urlHelper.RequestContext.HttpContext.Request.ToApplicationRootUrlString();
} }
@@ -34,14 +38,14 @@ namespace Orchard.Mvc.Extensions {
} }
// remove any application path from the base url // remove any application path from the base url
var applicationPath = urlHelper.RequestContext.HttpContext.Request.ApplicationPath; var applicationPath = urlHelper.RequestContext.HttpContext.Request.ApplicationPath ?? String.Empty;
// orchardlocal/foo/bar => /orchardlocal/foo/bar // orchardlocal/foo/bar => /orchardlocal/foo/bar
if(!url.StartsWith("/")) { if(!url.StartsWith("/")) {
url = "/" + url; url = "/" + url;
} }
// /orchardlocal/foo/bar => foo/bar // /orchardlocal/foo/bar => foo/bar
if (url.StartsWith(applicationPath)) { if (url.StartsWith(applicationPath, StringComparison.OrdinalIgnoreCase)) {
url = url.Substring(applicationPath.Length); url = url.Substring(applicationPath.Length);
} }