diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-07-05 12:11:59 -0500 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-07-05 12:11:59 -0500 |
| commit | 13c356545465a457b8c55dd9638f89165bab6271 (patch) | |
| tree | 66af85cd86d3117377baf09cf5b5c2df9ddd85a9 /phpBB/includes/controller | |
| parent | 1f4a717f9ec925d84b589547ce6c93a17ae863e9 (diff) | |
| download | forums-13c356545465a457b8c55dd9638f89165bab6271.tar forums-13c356545465a457b8c55dd9638f89165bab6271.tar.gz forums-13c356545465a457b8c55dd9638f89165bab6271.tar.bz2 forums-13c356545465a457b8c55dd9638f89165bab6271.tar.xz forums-13c356545465a457b8c55dd9638f89165bab6271.zip | |
[feature/twig] Remove style dependency for controller helper
If a controller wants to use set_style, it can just use phpbb_style
PHPBB3-11598
Diffstat (limited to 'phpBB/includes/controller')
| -rw-r--r-- | phpBB/includes/controller/helper.php | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/phpBB/includes/controller/helper.php b/phpBB/includes/controller/helper.php index ec09757a5d..74410ddfd1 100644 --- a/phpBB/includes/controller/helper.php +++ b/phpBB/includes/controller/helper.php @@ -24,12 +24,6 @@ use Symfony\Component\HttpFoundation\Response; class phpbb_controller_helper { /** - * Style object - * @var phpbb_style - */ - protected $style; - - /** * Template object * @var phpbb_template */ @@ -56,15 +50,13 @@ 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; @@ -72,21 +64,6 @@ class phpbb_controller_helper } /** - * 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. * * @param string $handle The template handle to render |