diff options
| author | geetakshi <geetakshi.19@gmail.com> | 2014-03-20 01:48:52 +0530 |
|---|---|---|
| committer | geetakshi <geetakshi.19@gmail.com> | 2014-03-20 01:48:52 +0530 |
| commit | 9a3011c2dd844a13d9d08192fe5463941a08ffcd (patch) | |
| tree | 964fb465269c5ea49c776aa10913342e6b7d4fff /phpBB | |
| parent | 66ed9881dfb143dc0d430132cf351f64ecc73bcb (diff) | |
| download | forums-9a3011c2dd844a13d9d08192fe5463941a08ffcd.tar forums-9a3011c2dd844a13d9d08192fe5463941a08ffcd.tar.gz forums-9a3011c2dd844a13d9d08192fe5463941a08ffcd.tar.bz2 forums-9a3011c2dd844a13d9d08192fe5463941a08ffcd.tar.xz forums-9a3011c2dd844a13d9d08192fe5463941a08ffcd.zip | |
[ticket/8309] Changing $last_activity to $last_active
PHPBB3-8309
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/acp/acp_users.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_main.php | 2 | ||||
| -rw-r--r-- | phpBB/memberlist.php | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index f74d49efd9..b1913eb6b3 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -1018,7 +1018,7 @@ class acp_users $s_action_options .= '<option value="' . $value . '">' . $user->lang['USER_ADMIN_' . $lang] . '</option>'; } - $last_activity = (!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_lastvisit']; $inactive_reason = ''; if ($user_row['user_type'] == USER_INACTIVE) @@ -1084,7 +1084,7 @@ class acp_users 'USER' => $user_row['username'], 'USER_REGISTERED' => $user->format_date($user_row['user_regdate']), 'REGISTERED_IP' => ($ip == 'hostname') ? gethostbyaddr($user_row['user_ip']) : $user_row['user_ip'], - 'USER_LASTACTIVE' => ($last_activity) ? $user->format_date($last_activity) : ' - ', + 'USER_LASTACTIVE' => ($last_active) ? $user->format_date($last_active) : ' - ', 'USER_EMAIL' => $user_row['user_email'], 'USER_WARNINGS' => $user_row['user_warnings'], 'USER_POSTS' => $user_row['user_posts'], diff --git a/phpBB/includes/ucp/ucp_main.php b/phpBB/includes/ucp/ucp_main.php index 086f347154..f0ce21fb48 100644 --- a/phpBB/includes/ucp/ucp_main.php +++ b/phpBB/includes/ucp/ucp_main.php @@ -189,7 +189,7 @@ class ucp_main $template->assign_vars(array( 'USER_COLOR' => (!empty($user->data['user_colour'])) ? $user->data['user_colour'] : '', 'JOINED' => $user->format_date($user->data['user_regdate']), - 'LAST_ACTIVE' => (empty($last_activity)) ? ' - ' : $user->format_date($last_activity), + 'LAST_ACTIVE' => (empty($last_active)) ? ' - ' : $user->format_date($last_active), 'WARNINGS' => ($user->data['user_warnings']) ? $user->data['user_warnings'] : 0, 'POSTS' => ($user->data['user_posts']) ? $user->data['user_posts'] : 0, 'POSTS_DAY' => $user->lang('POST_DAY', $posts_per_day), diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index c980daff21..738b0be01c 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -1666,11 +1666,11 @@ function show_profile($data, $user_notes_enabled = false, $warn_user_enabled = f if ($data['user_allow_viewonline'] || $auth->acl_get('u_viewonline')) { - $last_activity = (!empty($data['session_time'])) ? $data['session_time'] : $data['user_lastvisit']; + $last_active = (!empty($data['session_time'])) ? $data['session_time'] : $data['user_lastvisit']; } else { - $last_activity = ''; + $last_active = ''; } $age = ''; @@ -1703,7 +1703,7 @@ function show_profile($data, $user_notes_enabled = false, $warn_user_enabled = f 'AGE' => $age, 'RANK_TITLE' => $rank_title, 'JOINED' => $user->format_date($data['user_regdate']), - 'LAST_ACTIVE' => (empty($last_activity)) ? ' - ' : $user->format_date($last_activity), + 'LAST_ACTIVE' => (empty($last_active)) ? ' - ' : $user->format_date($last_active), 'POSTS' => ($data['user_posts']) ? $data['user_posts'] : 0, 'WARNINGS' => isset($data['user_warnings']) ? $data['user_warnings'] : 0, |