aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorgeetakshi <geetakshi.19@gmail.com>2014-03-16 03:37:21 +0530
committergeetakshi <geetakshi.19@gmail.com>2014-03-16 03:37:21 +0530
commit0bf758f00f86fa3164439bd528a69d230b823397 (patch)
tree125d6df096c157eca82436bfa15036bd55303c3a /phpBB
parent8c4604a78e89834afb8f352152480be9d954726d (diff)
downloadforums-0bf758f00f86fa3164439bd528a69d230b823397.tar
forums-0bf758f00f86fa3164439bd528a69d230b823397.tar.gz
forums-0bf758f00f86fa3164439bd528a69d230b823397.tar.bz2
forums-0bf758f00f86fa3164439bd528a69d230b823397.tar.xz
forums-0bf758f00f86fa3164439bd528a69d230b823397.zip
[ticket/8309] Rename $last_visit to $last_activity
PHPBB3-8309
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/includes/acp/acp_users.php4
-rw-r--r--phpBB/includes/ucp/ucp_main.php2
-rw-r--r--phpBB/memberlist.php6
3 files changed, 6 insertions, 6 deletions
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index c944f5f96f..f74d49efd9 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_visit = (!empty($user_row['session_time'])) ? $user_row['session_time'] : $user_row['user_lastvisit'];
+ $last_activity = (!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_visit) ? $user->format_date($last_visit) : ' - ',
+ 'USER_LASTACTIVE' => ($last_activity) ? $user->format_date($last_activity) : ' - ',
'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 1cae814cb5..67bb56efae 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_ACTIVITY' => (empty($last_visit)) ? ' - ' : $user->format_date($last_visit),
+ 'LAST_ACTIVITY' => (empty($last_activity)) ? ' - ' : $user->format_date($last_activity),
'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 22be25bf3d..9f0ac93545 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_visit = (!empty($data['session_time'])) ? $data['session_time'] : $data['user_lastvisit'];
+ $last_activity = (!empty($data['session_time'])) ? $data['session_time'] : $data['user_lastvisit'];
}
else
{
- $last_visit = '';
+ $last_activity = '';
}
$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_ACTIVITY' => (empty($last_visit)) ? ' - ' : $user->format_date($last_visit),
+ 'LAST_ACTIVITY' => (empty($last_activity)) ? ' - ' : $user->format_date($last_activity),
'POSTS' => ($data['user_posts']) ? $data['user_posts'] : 0,
'WARNINGS' => isset($data['user_warnings']) ? $data['user_warnings'] : 0,