lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Adding more field tokens

Browse Source 
--HG--
branch : 1.x
This commit is contained in:
Sebastien Ros
2012-05-03 14:51:40 -07:00
parent c5f32cfc84
commit 89118483e3
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.hgsubstate
View File

@@ -2,7 +2,7 @@
3ac4633527ad504aab9d0dcb5f7815105a368751 src/Orchard.Web/Modules/Orchard.Forms 3ac4633527ad504aab9d0dcb5f7815105a368751 src/Orchard.Web/Modules/Orchard.Forms
508486d085a2f5912771b59d77756a959524e59e src/Orchard.Web/Modules/Orchard.Rules 508486d085a2f5912771b59d77756a959524e59e src/Orchard.Web/Modules/Orchard.Rules
c549fb967b45b1353bf50f0ba1dc9e52ecc7ffc9 src/Orchard.Web/Modules/Orchard.TaskLease c549fb967b45b1353bf50f0ba1dc9e52ecc7ffc9 src/Orchard.Web/Modules/Orchard.TaskLease
08de296f928549032d02e6447506e9db21883cd2 src/Orchard.Web/Modules/Orchard.Tokens 724c3ba42d2cccb219cb8741fce0b5cc6932877e src/Orchard.Web/Modules/Orchard.Tokens
6ce7f9fe4d965ebdb41f5a576501cc445de56d60 src/orchard.web/Modules/Orchard.Alias 6ce7f9fe4d965ebdb41f5a576501cc445de56d60 src/orchard.web/Modules/Orchard.Alias
372a56ef39cad104696b22b94ac9c0bb24636392 src/orchard.web/Modules/Orchard.Projections 372a56ef39cad104696b22b94ac9c0bb24636392 src/orchard.web/Modules/Orchard.Projections
8c3b76a5491133513b48d6855a56632d326728f0 src/orchard.web/modules/Orchard.Fields 58de1c8056adda6bbdbab215ae86e2fb98ec5c10 src/orchard.web/modules/Orchard.Fields

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

@@ -40,10 +40,16 @@ 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 ?? String.Empty; var applicationPath = urlHelper.RequestContext.HttpContext.Request.ApplicationPath ?? String.Empty;
// ~/foo/bar => /foo/bar
if (url.StartsWith("~/", StringComparison.OrdinalIgnoreCase)) {
url = url.Substring(1);
}
// 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, StringComparison.OrdinalIgnoreCase)) { if (url.StartsWith(applicationPath, StringComparison.OrdinalIgnoreCase)) {
url = url.Substring(applicationPath.Length); url = url.Substring(applicationPath.Length);