diff options
| author | Neil Drumm <drumm@3064.no-reply.drupal.org> | 2006-04-30 00:37:44 +0000 |
|---|---|---|
| committer | Neil Drumm <drumm@3064.no-reply.drupal.org> | 2006-04-30 00:37:44 +0000 |
| commit | f0cd92dddef7fed244878d31d330e07174feefa2 (patch) | |
| tree | 9f33e06a486406d85de72ad1432d107aab0250f8 /modules | |
| parent | 8e10f1d48cd2b1093c46dac06322b4540cdc8f2b (diff) | |
| download | brdo-f0cd92dddef7fed244878d31d330e07174feefa2.tar.gz brdo-f0cd92dddef7fed244878d31d330e07174feefa2.tar.bz2 | |
Forward port from 4.7
#60907, don't use t() during user submit, neede for external auth, patch by Moshe
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/user.module | 3 | ||||
| -rw-r--r-- | modules/user/user.module | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/modules/user.module b/modules/user.module index 294a02296..f6f3f1a53 100644 --- a/modules/user.module +++ b/modules/user.module @@ -923,7 +923,8 @@ function user_login_validate($form_id, $form_values) { function user_login_submit($form_id, $form_values) { global $user; if ($user->uid) { - watchdog('user', t('Session opened for %name.', array('%name' => theme('placeholder', $user->name)))); + // sometimes modules call this function during a bootstrap so we don't use t() here + watchdog('user', "Session opened for ". check_plain($user->name)); // 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 294a02296..f6f3f1a53 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -923,7 +923,8 @@ function user_login_validate($form_id, $form_values) { function user_login_submit($form_id, $form_values) { global $user; if ($user->uid) { - watchdog('user', t('Session opened for %name.', array('%name' => theme('placeholder', $user->name)))); + // sometimes modules call this function during a bootstrap so we don't use t() here + watchdog('user', "Session opened for ". check_plain($user->name)); // Update the user table timestamp noting user has logged in. db_query("UPDATE {users} SET login = %d WHERE uid = %d", time(), $user->uid); |