mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-12 20:56:40 +02:00
Code Issues Releases Wiki Activity

Merge branch 'prep-release-3.3.12' into 3.3.x

Browse Source
This commit is contained in:
Marc Alexander
2024-05-22 21:54:10 +02:00
parent 6aa980eadb 130c10915e
commit d14f98f672
8 changed files with 122 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/includes/acp/acp_users.php
View File

@ -1084,7 +1084,7 @@ class acp_users
$s_action_options .= '<option value="' . $value . '">' . $user->lang['USER_ADMIN_' . $lang] . '</option>';
}
$last_active = (!empty($user_row['session_time'])) ? $user_row['session_time'] : $user_row['user_lastvisit'];
$last_active = (!empty($user_row['session_time'])) ? $user_row['session_time'] : $user_row['user_last_active'];
$inactive_reason = '';
if ($user_row['user_type'] == USER_INACTIVE)

2
phpBB/includes/functions_display.php
View File

@ -1603,7 +1603,7 @@ function phpbb_show_profile($data, $user_notes_enabled = false, $warn_user_enabl
if ($data['user_allow_viewonline'] || $auth->acl_get('u_viewonline'))
{
$last_active = (!empty($data['session_time'])) ? $data['session_time'] : $data['user_lastvisit'];
$last_active = (!empty($data['session_time'])) ? $data['session_time'] : $data['user_last_active'];
}
else
{

1
phpBB/includes/functions_user.php
View File

@ -227,6 +227,7 @@ function user_add($user_row, $cp_data = false, $notifications_data = null)
'user_inactive_time' => 0,
'user_lastmark' => time(),
'user_lastvisit' => 0,
'user_last_active' => 0,
'user_lastpost_time' => 0,
'user_lastpage' => '',
'user_posts' => 0,