summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorAngie Byron <webchick@24967.no-reply.drupal.org>2010-11-14 22:15:39 +0000
committerAngie Byron <webchick@24967.no-reply.drupal.org>2010-11-14 22:15:39 +0000
commiteed07e55dd0f4598979c1de79df0ca804a3cdcda (patch)
treeb1e9370821008c2c056b969ec36bb076e75380b0 /modules
parent0c33e8638845d4e8617d92776e95eac86c3e2e2a (diff)
downloadbrdo-eed07e55dd0f4598979c1de79df0ca804a3cdcda.tar.gz
brdo-eed07e55dd0f4598979c1de79df0ca804a3cdcda.tar.bz2
#938536 by David_Rothstein: Fixed User account tokens in _user_mail_text() should not be sanitized.
Diffstat (limited to 'modules')
-rw-r--r--modules/user/user.module4
1 files changed, 3 insertions, 1 deletions
diff --git a/modules/user/user.module b/modules/user/user.module
index d7a3be123..8592e0155 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -2649,7 +2649,9 @@ Your account on [site:name] has been canceled.
}
if ($replace) {
- return token_replace($text, $variables, array('language' => $language, 'callback' => 'user_mail_tokens'));
+ // 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 $text;