Commit edabf1fc authored by Dries's avatar Dries
Browse files

- Patch #1300298 by askibinski: empty tokens don't get replaced in welcome emails.

parent 5e6cc3c8
......@@ -2758,7 +2758,7 @@ function _user_mail_text($key, $language = NULL, $variables = array(), $replace
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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment