diff options
| author | Neil Drumm <drumm@3064.no-reply.drupal.org> | 2006-05-01 08:04:08 +0000 |
|---|---|---|
| committer | Neil Drumm <drumm@3064.no-reply.drupal.org> | 2006-05-01 08:04:08 +0000 |
| commit | 806d0f5393ddf3a7c6fe3a0ea979e673b08a6229 (patch) | |
| tree | 900d542c5b27de832040d7896ac3501827a47b53 /modules | |
| parent | 39c68013b389ba08347b23b29b34770300065168 (diff) | |
| download | brdo-806d0f5393ddf3a7c6fe3a0ea979e673b08a6229.tar.gz brdo-806d0f5393ddf3a7c6fe3a0ea979e673b08a6229.tar.bz2 | |
Forward prot from 4.7
#60907, better patch by Zen and dww
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/user.module | 11 | ||||
| -rw-r--r-- | modules/user/user.module | 11 |
2 files changed, 18 insertions, 4 deletions
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); |