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

Merge pull request #6194 from jtkech/patch-6

Browse Source 
[Fixes #6193] TokenFilters Cohabitation
This commit is contained in:
Sébastien Ros
2015-12-17 12:18:40 -08:00
parent cc1ceec277 36c5f1070f
commit 8a065d496d
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Orchard.Web/Modules/Orchard.Tokens/Implementation/Tokenizer.cs
View File

@@ -53,7 +53,9 @@ namespace Orchard.Tokens.Implementation {
var replacements = Evaluate(options.Predicate == null ? tokens : tokens.Where(options.Predicate), data); var replacements = Evaluate(options.Predicate == null ? tokens : tokens.Where(options.Predicate), data);
return replacements.Aggregate(tokenset.Item1, return replacements.Aggregate(tokenset.Item1,
(current, replacement) => current.Replace((hashMode ? "#{" : "{") + replacement.Key + "}", (options.Encoding ?? ReplaceOptions.NoEncode)(replacement.Key, replacement.Value))); (current, replacement) => replacement.Value == null ?
current : current.Replace((hashMode ? "#{" : "{") + replacement.Key + "}",
(options.Encoding ?? ReplaceOptions.NoEncode)(replacement.Key, replacement.Value)));
} }
private static Tuple<string, IEnumerable<string>> Parse(string text, bool hashMode) { private static Tuple<string, IEnumerable<string>> Parse(string text, bool hashMode) {
@@ -111,4 +113,4 @@ namespace Orchard.Tokens.Implementation {
} }
} }
} }