Merge pull request #4136 from zyhfish/bug/fix-issue-4121

Fix #4121: avoid nested square bracket issue.
oqtane · Apr 12, 2024 · 1dde79a · 1dde79a
2 parents e192383 + 5954fb9
commit 1dde79a
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/Oqtane.Server/Infrastructure/TokenReplace.cs b/Oqtane.Server/Infrastructure/TokenReplace.cs
@@ -93,6 +93,7 @@ public string ReplaceTokens(string source)
             }
 
             var result = new StringBuilder();
+            source = source.Replace("[[", "[$_["); //avoid nested square bracket issue.
             foreach (Match match in this.TokenizerRegex.Matches(source))
             {
                 var key = match.Result("${key}");
@@ -126,7 +127,7 @@ public string ReplaceTokens(string source)
                     result.Append(match.Result("${text}"));
                 }
             }
-
+            result.Replace("[$_", "["); //restore the changes.
             return result.ToString();
         }