lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-04-05 21:01:35 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #6067 from MpDzik/pr/tokens-1.9.x

Browse Source 
Fix handling braces in tokens
This commit is contained in:
Sébastien Ros 2015-11-23 08:56:36 -08:00
commit 7d689710cc
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,7 +59,7 @@ namespace Orchard.Tokens.Implementation {
private static Tuple<string, IEnumerable<string>> Parse(string text, bool hashMode) {
var tokens = new List<string>();
if (!String.IsNullOrEmpty(text)) {
var inToken = false;
var inTokenDepth = 0;
var tokenStart = 0;
for (var i = 0; i < text.Length; i++) {
var c = text[i];
@ -70,29 +70,32 @@ namespace Orchard.Tokens.Implementation {
continue;
}
}
else if (c == '}' && !(inToken)) {
else if (c == '}' && inTokenDepth == 0) {
if (i + 1 < text.Length && text[i + 1] == '}') {
text = text.Substring(0, i) + text.Substring(i + 1);
continue;
}
}
if (inToken) {
if (inTokenDepth > 0) {
if (c == '}') {
inToken = false;
var token = text.Substring(tokenStart + 1, i - tokenStart - 1);
tokens.Add(token);
inTokenDepth--;
if (inTokenDepth == 0) {
var token = text.Substring(tokenStart + 1, i - tokenStart - 1);
tokens.Add(token);
}
}
}
else if (!hashMode && c == '{') {
inToken = true;
tokenStart = i;
if (!hashMode && c == '{') {
if (inTokenDepth == 0) tokenStart = i;
inTokenDepth++;
}
else if (hashMode && c == '#'
&& i + 1 < text.Length && text[i + 1] == '{'
&& (i + 2 > text.Length || text[i + 2] != '{') ) {
inToken = true;
tokenStart = i+1;
&& (i + 2 > text.Length || text[i + 2] != '{') ) {
if (inTokenDepth == 0) tokenStart = i+1;
inTokenDepth++;
}
}
}