Commit f0cd92dd authored by drumm's avatar drumm
Browse files

Forward port from 4.7

#60907, don't use t() during user submit, neede for external auth, patch by Moshe
parent 8e10f1d4
......@@ -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);
......
......@@ -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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment