diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-07-24 12:24:35 -0500 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-07-24 12:24:35 -0500 |
| commit | 5d1afb453211d42a8deacb66684c136385918192 (patch) | |
| tree | dec14540ed07ca03bf223738aee405e4b604cd99 /phpBB/phpbb/controller | |
| parent | 44a82dd0837a4693b6a4a410c21c438f244094d3 (diff) | |
| download | forums-5d1afb453211d42a8deacb66684c136385918192.tar forums-5d1afb453211d42a8deacb66684c136385918192.tar.gz forums-5d1afb453211d42a8deacb66684c136385918192.tar.bz2 forums-5d1afb453211d42a8deacb66684c136385918192.tar.xz forums-5d1afb453211d42a8deacb66684c136385918192.zip | |
[ticket/11628] Remove phpbb_style (move methods to phpbb_template)
PHPBB3-11628
Diffstat (limited to 'phpBB/phpbb/controller')
| -rw-r--r-- | phpBB/phpbb/controller/resolver.php | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/phpBB/phpbb/controller/resolver.php b/phpBB/phpbb/controller/resolver.php index 95dfc8da8e..850df84a0f 100644 --- a/phpBB/phpbb/controller/resolver.php +++ b/phpBB/phpbb/controller/resolver.php @@ -38,23 +38,23 @@ class phpbb_controller_resolver implements ControllerResolverInterface protected $container; /** - * phpbb_style object - * @var phpbb_style + * phpbb_template object + * @var phpbb_template */ - protected $style; + protected $template; /** * Construct method * * @param phpbb_user $user User Object * @param ContainerInterface $container ContainerInterface object - * @param phpbb_style $style + * @param phpbb_template_interface $template */ - public function __construct(phpbb_user $user, ContainerInterface $container, phpbb_style $style = null) + public function __construct(phpbb_user $user, ContainerInterface $container, phpbb_template $template = null) { $this->user = $user; $this->container = $container; - $this->style = $style; + $this->template = $template; } /** @@ -96,13 +96,13 @@ class phpbb_controller_resolver implements ControllerResolverInterface $controller_dir = explode('_', get_class($controller_object)); // 0 phpbb, 1 ext, 2 vendor, 3 extension name, ... - if (!is_null($this->style) && isset($controller_dir[3]) && $controller_dir[1] === 'ext') + if (!is_null($this->template) && isset($controller_dir[3]) && $controller_dir[1] === 'ext') { $controller_style_dir = 'ext/' . $controller_dir[2] . '/' . $controller_dir[3] . '/styles'; if (is_dir($controller_style_dir)) { - $this->style->set_style(array($controller_style_dir, 'styles')); + $this->template->set_style(array($controller_style_dir, 'styles')); } } |