Line 373 | Line 373 |
---|
if ($user_row['user_type'] == USER_NORMAL) { user_active_flip('deactivate', $user_id, INACTIVE_REMIND);
|
if ($user_row['user_type'] == USER_NORMAL) { user_active_flip('deactivate', $user_id, INACTIVE_REMIND);
|
$sql = 'UPDATE ' . USERS_TABLE . " SET user_actkey = '" . $db->sql_escape($user_actkey) . "' WHERE user_id = $user_id"; $db->sql_query($sql);
| |
} else {
| } else {
|
Line 386 | Line 381 |
---|
FROM ' . USERS_TABLE . ' WHERE user_id = ' . $user_id; $result = $db->sql_query($sql);
|
FROM ' . USERS_TABLE . ' WHERE user_id = ' . $user_id; $result = $db->sql_query($sql);
|
$user_actkey = (string) $db->sql_fetchfield('user_actkey');
| $user_activation_key = (string) $db->sql_fetchfield('user_actkey');
|
$db->sql_freeresult($result);
|
$db->sql_freeresult($result);
|
| $user_actkey = empty($user_activation_key) ? $user_actkey : $user_activation_key; }
if ($user_row['user_type'] == USER_NORMAL || empty($user_activation_key)) { $sql = 'UPDATE ' . USERS_TABLE . " SET user_actkey = '" . $db->sql_escape($user_actkey) . "' WHERE user_id = $user_id"; $db->sql_query($sql);
|
}
$messenger = new messenger(false);
| }
$messenger = new messenger(false);
|
Line 1924 | Line 1929 |
---|
'S_FORM_ENCTYPE' => ' enctype="multipart/form-data"',
|
'S_FORM_ENCTYPE' => ' enctype="multipart/form-data"',
|
'L_AVATAR_EXPLAIN' => sprintf($user->lang['AVATAR_EXPLAIN'], $config['avatar_max_width'], $config['avatar_max_height'], $config['avatar_filesize'] / 1024),
| 'L_AVATAR_EXPLAIN' => $user->lang(($config['avatar_filesize'] == 0) ? 'AVATAR_EXPLAIN_NO_FILESIZE' : 'AVATAR_EXPLAIN', $config['avatar_max_width'], $config['avatar_max_height'], $config['avatar_filesize'] / 1024),
|
'S_AVATARS_ENABLED' => ($config['allow_avatar'] && $avatars_enabled), ));
| 'S_AVATARS_ENABLED' => ($config['allow_avatar'] && $avatars_enabled), ));
|