makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 05:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.2.x'

Browse source
This commit is contained in:
Marc Alexander 2017-06-05 11:16:35 +02:00
commit 970c44b05f
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
phpBB/phpbb/help/controller/help.php
View file

@ -64,6 +64,7 @@ class help
*/ */
public function handle($mode) public function handle($mode)
{ {
$template_file = 'faq_body.html';
switch ($mode) switch ($mode)
{ {
case 'faq': case 'faq':
@ -85,13 +86,16 @@ class help
* @var string lang_file Language file containing the help data * @var string lang_file Language file containing the help data
* @var string ext_name Vendor and extension name where the help * @var string ext_name Vendor and extension name where the help
* language file can be loaded from * language file can be loaded from
* @var string template_file Template file name
* @since 3.1.4-RC1 * @since 3.1.4-RC1
* @changed 3.1.11-RC1 Added template_file var
*/ */
$vars = array( $vars = array(
'page_title', 'page_title',
'mode', 'mode',
'lang_file', 'lang_file',
'ext_name', 'ext_name',
'template_file',
); );
extract($this->dispatcher->trigger_event('core.faq_mode_validation', compact($vars))); extract($this->dispatcher->trigger_event('core.faq_mode_validation', compact($vars)));
@ -113,7 +117,7 @@ class help
$this->assign_to_template($this->user->help); $this->assign_to_template($this->user->help);
make_jumpbox(append_sid("{$this->root_path}viewforum.{$this->php_ext}")); 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);
} }
/** /**