aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions.php
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2015-03-05 15:25:30 +0100
committerMarc Alexander <admin@m-a-styles.de>2015-03-05 15:25:30 +0100
commit7c26cd25c7526cf9ab0bd2915f08e2b8d66a59fb (patch)
tree19d1b86fa6ef3334224ada4a2cfd2546778dec7b /phpBB/includes/functions.php
parent87ca5ef7e5610c72efcb3fd92d415082004d5ae2 (diff)
parent7e0d54a331ccb569dafeae8b051db5a34e177b5f (diff)
downloadforums-7c26cd25c7526cf9ab0bd2915f08e2b8d66a59fb.tar
forums-7c26cd25c7526cf9ab0bd2915f08e2b8d66a59fb.tar.gz
forums-7c26cd25c7526cf9ab0bd2915f08e2b8d66a59fb.tar.bz2
forums-7c26cd25c7526cf9ab0bd2915f08e2b8d66a59fb.tar.xz
forums-7c26cd25c7526cf9ab0bd2915f08e2b8d66a59fb.zip
Merge pull request #3434 from nickvergessen/ticket/13647
[ticket/13647] Move FAQ page to a controller
Diffstat (limited to 'phpBB/includes/functions.php')
-rw-r--r--phpBB/includes/functions.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index fcfba6f4ed..2514dd48d5 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -4862,6 +4862,8 @@ function page_header($page_title = '', $display_online_list = false, $item_id =
}
}
+ /** @var \phpbb\controller\helper $controller_helper */
+ $controller_helper = $phpbb_container->get('controller.helper');
$notification_mark_hash = generate_link_hash('mark_all_notifications_read');
// The following assigns all _common_ variables that may be used at any point in a template.
@@ -4915,7 +4917,7 @@ function page_header($page_title = '', $display_online_list = false, $item_id =
'U_PROFILE' => append_sid("{$phpbb_root_path}ucp.$phpEx"),
'U_USER_PROFILE' => get_username_string('profile', $user->data['user_id'], $user->data['username'], $user->data['user_colour']),
'U_MODCP' => append_sid("{$phpbb_root_path}mcp.$phpEx", false, true, $user->session_id),
- 'U_FAQ' => append_sid("{$phpbb_root_path}faq.$phpEx"),
+ 'U_FAQ' => $controller_helper->route('phpbb_help_controller', array('mode' => 'faq')),
'U_SEARCH_SELF' => append_sid("{$phpbb_root_path}search.$phpEx", 'search_id=egosearch'),
'U_SEARCH_NEW' => append_sid("{$phpbb_root_path}search.$phpEx", 'search_id=newposts'),
'U_SEARCH_UNANSWERED' => append_sid("{$phpbb_root_path}search.$phpEx", 'search_id=unanswered'),