From 0ab418521486f2e02110be790221d82d85bdc04a Mon Sep 17 00:00:00 2001
From: Bob Vincent <bobvin@pillars.net>
Date: Fri, 20 May 2011 17:16:50 -0400
Subject: [PATCH] Issue #401266 by pillarsdotnet: Check for "login", "pass" properties before calling user_pass_reset_url() function.

---
 modules/user/user.module |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/modules/user/user.module b/modules/user/user.module
index a4dfe773ebe85e8b24306c44e697e8a672b49633..2d0085742e79583f8188b71f1744f0d85a9b50ae 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -2121,7 +2121,7 @@ function user_mail_tokens($account, $language) {
   $tokens = array(
     '!username' => $account->name,
     '!site' => variable_get('site_name', 'Drupal'),
-    '!login_url' => user_pass_reset_url($account),
+    '!login_url' => (isset($account->pass) && isset($account->login)) ? user_pass_reset_url($account) : url('user/login'),
     '!uri' => $base_url,
     '!uri_brief' => preg_replace('!^https?://!', '', $base_url),
     '!mailto' => $account->mail,
-- 
1.7.4.1