mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

[feature/twig] Remove style dependency for controller helper

Browse Source 
If a controller wants to use set_style, it can just use phpbb_style

PHPBB3-11598
This commit is contained in:
Nathan Guse
2013-07-05 12:11:59 -05:00
parent 1f4a717f9e
commit 13c3565454
3 changed files with 2 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
phpBB/includes/controller/helper.php
View File

@@ -23,12 +23,6 @@ use Symfony\Component\HttpFoundation\Response;
*/
class phpbb_controller_helper
{
/**
* Style object
* @var phpbb_style
*/
protected $style;
/**
* Template object
* @var phpbb_template
@@ -56,36 +50,19 @@ class phpbb_controller_helper
/**
* Constructor
*
* @param phpbb_style $style Style object
* @param phpbb_template $template Template object
* @param phpbb_user $user User object
* @param string $phpbb_root_path phpBB root path
* @param string $php_ext PHP extension
*/
public function __construct(phpbb_style $style, phpbb_template $template, phpbb_user $user, $phpbb_root_path, $php_ext)
public function __construct(phpbb_template $template, phpbb_user $user, $phpbb_root_path, $php_ext)
{
$this->style = $style;
$this->template = $template;
$this->user = $user;
$this->phpbb_root_path = $phpbb_root_path;
$this->php_ext = $php_ext;
}
/**
* Set style location based on (current) user's chosen style.
*
* @param array $style_directories The directories to add style paths for
* E.g. array('ext/foo/bar/styles', 'styles')
* Default: array('styles') (phpBB's style directory)
* @return phpbb_controller_helper $this
*/
public function set_style($style_base_directory = array('styles'))
{
$this->style->set_style($style_base_directory);
return $this;
}
/**
* Automate setting up the page and creating the response object.
*