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

Fix TextTokens - Format and TrimEnd

Browse Source 
This fixes the Format and TrimEnd tokens and adds unit tests for
all TextTokens.
This commit is contained in:
Marek Dzikiewicz
2015-11-19 23:01:50 +01:00
parent 500255c3b1
commit b3bf80395a
3 changed files with 124 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Orchard.Web/Modules/Orchard.Tokens/Providers/TextTokens.cs
View File

@@ -35,7 +35,7 @@ namespace Orchard.Tokens.Providers {
// {Text.Format:<formatstring>}
.Token(
token => FilterTokenParam("Format:", token),
(token, d) => String.Format(d, token))
(token, d) => String.Format(token, d))
// {Text.TrimEnd:<chars|number>}
.Token(token => FilterTokenParam("TrimEnd:", token), TrimEnd)
.Token("UrlEncode", HttpUtility.UrlEncode)
@@ -54,7 +54,7 @@ namespace Orchard.Tokens.Providers {
return token.StartsWith(tokenName, StringComparison.OrdinalIgnoreCase) ? token.Substring(tokenName.Length) : null;
}
private static string TrimEnd(string token, string param) {
private static string TrimEnd(string param, string token) {
if (String.IsNullOrEmpty(param)) {
return token;
}