summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDries <dries@buytaert.net>2012-02-21 14:03:06 -0500
committerDries <dries@buytaert.net>2012-02-21 14:03:06 -0500
commite585f954596c98032dab5cfc62ddbef7419f4220 (patch)
tree0b0ebdb64e30d3cd1c4a03d75036cec6da3bc0fb
parent2a2487ded259efc1087157aceeb9b08a9fcba5d2 (diff)
downloadbrdo-e585f954596c98032dab5cfc62ddbef7419f4220.tar.gz
brdo-e585f954596c98032dab5cfc62ddbef7419f4220.tar.bz2
- Patch #1300298 by askibinski: empty tokens don't get replaced in welcome emails.
-rw-r--r--modules/user/user.module2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/user/user.module b/modules/user/user.module
index 586004526..18349a13d 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -2739,7 +2739,7 @@ Your account on [site:name] has been canceled.
if ($replace) {
// We do not sanitize the token replacement, since the output of this
// replacement is intended for an e-mail message, not a web browser.
- return token_replace($text, $variables, array('language' => $language, 'callback' => 'user_mail_tokens', 'sanitize' => FALSE));
+ return token_replace($text, $variables, array('language' => $language, 'callback' => 'user_mail_tokens', 'sanitize' => FALSE, 'clear' => TRUE));
}
return $text;