diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2017-06-05 11:16:32 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2017-06-05 11:16:32 +0200 |
| commit | fd5a013f066ba657a73e7b7aff1ed0e74f5e2a46 (patch) | |
| tree | 617121ff76126ebd79e074fad708d762e8cd7caf /phpBB/phpbb/help/controller | |
| parent | be76d582dceabdba614ccc6e76dad7ea19b3006b (diff) | |
| parent | 3114e5399c015e4679572102202eee7c99e6d2b5 (diff) | |
| download | forums-fd5a013f066ba657a73e7b7aff1ed0e74f5e2a46.tar forums-fd5a013f066ba657a73e7b7aff1ed0e74f5e2a46.tar.gz forums-fd5a013f066ba657a73e7b7aff1ed0e74f5e2a46.tar.bz2 forums-fd5a013f066ba657a73e7b7aff1ed0e74f5e2a46.tar.xz forums-fd5a013f066ba657a73e7b7aff1ed0e74f5e2a46.zip | |
Merge pull request #4811 from rxu/ticket/15200
[ticket/15200] Allow extensions using custom templates for help/faq controllers
Diffstat (limited to 'phpBB/phpbb/help/controller')
| -rw-r--r-- | phpBB/phpbb/help/controller/help.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/phpBB/phpbb/help/controller/help.php b/phpBB/phpbb/help/controller/help.php index 9cc3b0c8b4..3bf6fe3098 100644 --- a/phpBB/phpbb/help/controller/help.php +++ b/phpBB/phpbb/help/controller/help.php @@ -64,6 +64,7 @@ class help */ public function handle($mode) { + $template_file = 'faq_body.html'; switch ($mode) { case 'faq': @@ -85,13 +86,16 @@ class help * @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($this->dispatcher->trigger_event('core.faq_mode_validation', compact($vars))); @@ -113,7 +117,7 @@ class help $this->assign_to_template($this->user->help); make_jumpbox(append_sid("{$this->root_path}viewforum.{$this->php_ext}")); - return $this->helper->render('faq_body.html', $page_title); + return $this->helper->render($template_file, $page_title); } /** |