From 3c53ffb09a923c5eccf571f4f8be68c76de10d1f Mon Sep 17 00:00:00 2001 From: HermesSbicego-Laser Date: Fri, 4 Nov 2016 13:43:38 +0100 Subject: [PATCH] - replaced Regex.Replace with String.Trim(char[]) as suggested - ran Orchard.Tokens.Tests: 66/66 passed --- .../Modules/Orchard.Tokens/Providers/RequestTokens.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.Tokens/Providers/RequestTokens.cs b/src/Orchard.Web/Modules/Orchard.Tokens/Providers/RequestTokens.cs index 03f1c4902..5f472b6d2 100644 --- a/src/Orchard.Web/Modules/Orchard.Tokens/Providers/RequestTokens.cs +++ b/src/Orchard.Web/Modules/Orchard.Tokens/Providers/RequestTokens.cs @@ -129,12 +129,12 @@ namespace Orchard.Tokens.Providers { chainIndex = token.IndexOf(").") + 1; tokenLength = (tokenPrefix + ":").Length; if (chainIndex == 0) {// ")." has not be found - return Regex.Replace(token.Substring(tokenLength), @"[\(|\)]", ""); + return token.Substring(tokenLength).Trim(new char[] { '(', ')' }); } if (!token.StartsWith((tokenPrefix + ":"), StringComparison.OrdinalIgnoreCase) || chainIndex <= tokenLength) { return null; } - return Regex.Replace(token.Substring(tokenLength, chainIndex - tokenLength), @"[\(|\)]", ""); + return token.Substring(tokenLength, chainIndex - tokenLength).Trim(new char[] { '(', ')' }); } private static Tuple FilterChainParam(string token) { string tokenPrefix; @@ -152,12 +152,12 @@ namespace Orchard.Tokens.Providers { chainIndex = token.IndexOf(").") + 1; tokenLength = (tokenPrefix + ":").Length; if (chainIndex == 0) { // ")." has not be found - return new Tuple(Regex.Replace(token.Substring(tokenLength), @"[\(|\)]", ""), token.Length.ToString()); + return new Tuple(token.Substring(tokenLength).Trim(new char[] { '(', ')' }), token.Length.ToString()); } if (!token.StartsWith((tokenPrefix + ":"), StringComparison.OrdinalIgnoreCase) || chainIndex <= tokenLength) { return null; } - return new Tuple(Regex.Replace(token.Substring(tokenLength, chainIndex - tokenLength), @"[\(|\)]", ""), token.Substring(chainIndex + 1)); + return new Tuple(token.Substring(tokenLength, chainIndex - tokenLength).Trim(new char[] { '(', ')' }), token.Substring(chainIndex + 1)); } }