From edabf1fc3add074b9818b6fb125e287f6091ab2c Mon Sep 17 00:00:00 2001
From: Dries <dries@buytaert.net>
Date: Tue, 21 Feb 2012 14:02:50 -0500
Subject: [PATCH] - Patch #1300298 by askibinski: empty tokens don't get
 replaced in welcome emails.

---
 core/modules/user/user.module | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index 928daad5362..f4479ec4c2c 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -2758,7 +2758,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;