projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge pull request #679 from davecivicrm/CRM-12397
[civicrm-core.git]
/
CRM
/
Utils
/
Token.php
diff --git
a/CRM/Utils/Token.php
b/CRM/Utils/Token.php
index 6f170472010c1df451eb84bc1c4ffd00b5220c03..1047ceca4b57921ba9524a72c8363d0c86679e84 100644
(file)
--- 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);
}
/**