From: Donald A. Lobo <lobo@civicrm.org>
Date: Mon, 22 Apr 2013 21:55:38 +0000 (-0700)
Subject: CRM-12396
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=93f087c753b632de36f9764adad5955564d52fba;p=civicrm-core.git

CRM-12396

----------------------------------------
* CRM-12396: tokens in html not transformed
  http://issues.civicrm.org/jira/browse/CRM-12396
---

diff --git a/CRM/Utils/Token.php b/CRM/Utils/Token.php
index 6f17047201..1047ceca4b 100644
--- a/CRM/Utils/Token.php
+++ b/CRM/Utils/Token.php
@@ -155,7 +155,7 @@ class CRM_Utils_Token {
    */
   public static function token_match($type, $var, &$str) {
     $token = preg_quote('{' . "$type.$var") . '(\|.+?)?' . preg_quote('}');
-    return preg_match("/(^|[^\{]) $token/", $str);
+    return preg_match("/(^|[^\{])$token/", $str);
   }
 
   /**