mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 20:44:01 +01:00
Code Issues Releases Wiki Activity

Merge branch 'develop-ascraeus' into develop

Browse Source 
* develop-ascraeus:
  [ticket/12837] Use else if instead of elseif
  [ticket/12837] Detect "viewing contact admin page" on viewonline
This commit is contained in:
Joas Schilling 2014-07-16 21:54:17 +02:00
commit ec4886a266
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
phpBB/language/en/common.php
View File

@ -821,6 +821,7 @@ $lang = array_merge($lang, array(
1 => 'Viewed %d time', 1 => 'Viewed %d time',
2 => 'Viewed %d times', 2 => 'Viewed %d times',
), ),
'VIEWING_CONTACT_ADMIN' => 'Viewing contact page',
'VIEWING_FAQ' => 'Viewing FAQ', 'VIEWING_FAQ' => 'Viewing FAQ',
'VIEWING_MEMBERS' => 'Viewing member details', 'VIEWING_MEMBERS' => 'Viewing member details',
'VIEWING_ONLINE' => 'Viewing who is online', 'VIEWING_ONLINE' => 'Viewing who is online',

15
phpBB/viewonline.php
View File

@ -295,8 +295,21 @@ while ($row = $db->sql_fetchrow($result))
break; break;
case 'memberlist': case 'memberlist':
$location = (strpos($row['session_page'], 'mode=viewprofile') !== false) ? $user->lang['VIEWING_MEMBER_PROFILE'] : $user->lang['VIEWING_MEMBERS'];
$location_url = append_sid("{$phpbb_root_path}memberlist.$phpEx"); $location_url = append_sid("{$phpbb_root_path}memberlist.$phpEx");
if (strpos($row['session_page'], 'mode=viewprofile') !== false)
{
$location = $user->lang['VIEWING_MEMBER_PROFILE'];
}
else if (strpos($row['session_page'], 'mode=contactadmin') !== false)
{
$location = $user->lang['VIEWING_CONTACT_ADMIN'];
$location_url = append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contactadmin');
}
else
{
$location = $user->lang['VIEWING_MEMBERS'];
}
break; break;
case 'mcp': case 'mcp':