diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-02-22 22:57:14 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-02-22 22:57:14 +0100 |
| commit | 9c6fba558c3c7f650da89febd90a4a4220667d3d (patch) | |
| tree | 9ccc6436fe546080fe85668eb2a13ae558ff4bff | |
| parent | 19a236205f6e0892be4301b422f5da7479e12941 (diff) | |
| download | forums-9c6fba558c3c7f650da89febd90a4a4220667d3d.tar forums-9c6fba558c3c7f650da89febd90a4a4220667d3d.tar.gz forums-9c6fba558c3c7f650da89febd90a4a4220667d3d.tar.bz2 forums-9c6fba558c3c7f650da89febd90a4a4220667d3d.tar.xz forums-9c6fba558c3c7f650da89febd90a4a4220667d3d.zip | |
[ticket/13647] Switch FAQ handling in view online to controller
PHPBB3-13647
| -rw-r--r-- | phpBB/viewonline.php | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/phpBB/viewonline.php b/phpBB/viewonline.php index ccbdc8d57e..46f67b93fa 100644 --- a/phpBB/viewonline.php +++ b/phpBB/viewonline.php @@ -163,6 +163,9 @@ $result = $db->sql_query($db->sql_build_query('SELECT', $sql_ary)); $prev_id = $prev_ip = $user_list = array(); $logged_visible_online = $logged_hidden_online = $counter = 0; +/** @var \phpbb\controller\helper $controller_helper */ +$controller_helper = $phpbb_container->get('controller.helper'); + while ($row = $db->sql_fetchrow($result)) { if ($row['user_id'] != ANONYMOUS && !isset($prev_id[$row['user_id']])) @@ -287,11 +290,6 @@ while ($row = $db->sql_fetchrow($result)) $location_url = append_sid("{$phpbb_root_path}search.$phpEx"); break; - case 'faq': - $location = $user->lang['VIEWING_FAQ']; - $location_url = append_sid("{$phpbb_root_path}faq.$phpEx"); - break; - case 'viewonline': $location = $user->lang['VIEWING_ONLINE']; $location_url = append_sid("{$phpbb_root_path}viewonline.$phpEx"); @@ -357,6 +355,13 @@ while ($row = $db->sql_fetchrow($result)) default: $location = $user->lang['INDEX']; $location_url = append_sid("{$phpbb_root_path}index.$phpEx"); + + if ($row['session_page'] === 'app.' . $phpEx . '/help/faq' || + $row['session_page'] === 'app.' . $phpEx . '/help/bbcode') + { + $location = $user->lang['VIEWING_FAQ']; + $location_url = $controller_helper->route('phpbb_help_controller', array('mode' => 'faq')); + } break; } |