From 806d0f5393ddf3a7c6fe3a0ea979e673b08a6229 Mon Sep 17 00:00:00 2001
From: Neil Drumm <drumm@3064.no-reply.drupal.org>
Date: Mon, 1 May 2006 08:04:08 +0000
Subject: Forward prot from 4.7 #60907, better patch by Zen and dww

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

(limited to 'modules')

diff --git a/modules/user.module b/modules/user.module
index f6f3f1a53..05749c505 100644
--- a/modules/user.module
+++ b/modules/user.module
@@ -923,8 +923,15 @@ function user_login_validate($form_id, $form_values) {
 function user_login_submit($form_id, $form_values) {
   global $user;
   if ($user->uid) {
-    // sometimes modules call this function during a bootstrap so we don't use t() here
-    watchdog('user', "Session opened for ". check_plain($user->name));
+    // To handle the edge case where this function is called during a
+    // bootstrap, check for the existence of t().
+    if (function_exists('t')) {
+      $message = t('Session opened for %name.', array('%name' => theme('placeholder', $user->name)));
+    }
+    else {
+       $message = "Session opened for ". check_plain($user->name);
+    }
+    watchdog('user', $message);
 
     // Update the user table timestamp noting user has logged in.
     db_query("UPDATE {users} SET login = %d WHERE uid = %d", time(), $user->uid);
diff --git a/modules/user/user.module b/modules/user/user.module
index f6f3f1a53..05749c505 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -923,8 +923,15 @@ function user_login_validate($form_id, $form_values) {
 function user_login_submit($form_id, $form_values) {
   global $user;
   if ($user->uid) {
-    // sometimes modules call this function during a bootstrap so we don't use t() here
-    watchdog('user', "Session opened for ". check_plain($user->name));
+    // To handle the edge case where this function is called during a
+    // bootstrap, check for the existence of t().
+    if (function_exists('t')) {
+      $message = t('Session opened for %name.', array('%name' => theme('placeholder', $user->name)));
+    }
+    else {
+       $message = "Session opened for ". check_plain($user->name);
+    }
+    watchdog('user', $message);
 
     // Update the user table timestamp noting user has logged in.
     db_query("UPDATE {users} SET login = %d WHERE uid = %d", time(), $user->uid);
-- 
cgit v1.2.3