mirror of
https://github.com/OrchardCMS/Orchard.git
synced 2025-10-15 19:54:57 +08:00
Corrected urls generation on multi tenants listing with Azure
--HG-- branch : dev
This commit is contained in:
@@ -4,15 +4,12 @@ using Orchard.Environment.Configuration;
|
|||||||
namespace Orchard.MultiTenancy.Extensions {
|
namespace Orchard.MultiTenancy.Extensions {
|
||||||
public static class UrlHelperExtensions {
|
public static class UrlHelperExtensions {
|
||||||
public static string Tenant(this UrlHelper urlHelper, ShellSettings tenantShellSettings) {
|
public static string Tenant(this UrlHelper urlHelper, ShellSettings tenantShellSettings) {
|
||||||
//info: (heskew) might not keep the port insertion around beyond...
|
|
||||||
var port = urlHelper.RequestContext.HttpContext.Request.Url.Port;
|
|
||||||
return string.Format(
|
return string.Format(
|
||||||
"http://{0}{2}/{1}",
|
"http://{0}/{1}",
|
||||||
!string.IsNullOrEmpty(tenantShellSettings.RequestUrlHost)
|
!string.IsNullOrEmpty(tenantShellSettings.RequestUrlHost)
|
||||||
? tenantShellSettings.RequestUrlHost
|
? tenantShellSettings.RequestUrlHost
|
||||||
: urlHelper.RequestContext.HttpContext.Request.Url.Host,
|
: urlHelper.RequestContext.HttpContext.Request.Headers["Host"],
|
||||||
tenantShellSettings.RequestUrlPrefix,
|
tenantShellSettings.RequestUrlPrefix);
|
||||||
port != 80 ? string.Format(":{0}", port) : "");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
Reference in New Issue
Block a user