Commit 806d0f53 authored by drumm's avatar drumm
Browse files

Forward prot from 4.7

#60907, better patch by Zen and dww
parent 39c68013
......@@ -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);
......
......@@ -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);
......
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