diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2017-06-05 11:18:27 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2017-06-05 11:18:27 +0200 |
| commit | f0dbfc56d54fc4145fba2e1134d30f653b0964d5 (patch) | |
| tree | ab55987fc1ed2f4eb29ce9a88179e0329a5c3fe2 | |
| parent | acf9cdba01febd0d5627f20f22e6c61d63519fbc (diff) | |
| parent | 33a62648d10f368aa7ddc77272a296db4de81bcb (diff) | |
| download | forums-f0dbfc56d54fc4145fba2e1134d30f653b0964d5.tar forums-f0dbfc56d54fc4145fba2e1134d30f653b0964d5.tar.gz forums-f0dbfc56d54fc4145fba2e1134d30f653b0964d5.tar.bz2 forums-f0dbfc56d54fc4145fba2e1134d30f653b0964d5.tar.xz forums-f0dbfc56d54fc4145fba2e1134d30f653b0964d5.zip | |
Merge pull request #4812 from rxu/ticket/15200-3.1.x
[ticket/15200] Allow extensions using custom templates for help/faq controllers
| -rw-r--r-- | phpBB/faq.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/phpBB/faq.php b/phpBB/faq.php index 5fe155eab0..cf34ce809a 100644 --- a/phpBB/faq.php +++ b/phpBB/faq.php @@ -25,6 +25,7 @@ $auth->acl($user->data); $user->setup(); $mode = request_var('mode', ''); +$template_file = 'faq_body.html'; // Load the appropriate faq file switch ($mode) @@ -47,13 +48,16 @@ switch ($mode) * @var string lang_file Language file containing the help data * @var string ext_name Vendor and extension name where the help * language file can be loaded from + * @var string template_file Template file name * @since 3.1.4-RC1 + * @changed 3.1.11-RC1 Added template_file var */ $vars = array( 'page_title', 'mode', 'lang_file', 'ext_name', + 'template_file', ); extract($phpbb_dispatcher->trigger_event('core.faq_mode_validation', compact($vars))); @@ -106,7 +110,7 @@ $template->assign_vars(array( page_header($l_title); $template->set_filenames(array( - 'body' => 'faq_body.html') + 'body' => $template_file) ); make_jumpbox(append_sid("{$phpbb_root_path}viewforum.$phpEx")); |