diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-07-04 11:16:44 -0500 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-07-04 11:16:44 -0500 |
| commit | b7ede06835ba784b81365946f057adf75ae7592b (patch) | |
| tree | 60448987664bfbe70a51148e2107e1a1e380a93f /phpBB/includes/controller | |
| parent | 1ce33c1ff62426d030731cca100c4119bcd5265d (diff) | |
| download | forums-b7ede06835ba784b81365946f057adf75ae7592b.tar forums-b7ede06835ba784b81365946f057adf75ae7592b.tar.gz forums-b7ede06835ba784b81365946f057adf75ae7592b.tar.bz2 forums-b7ede06835ba784b81365946f057adf75ae7592b.tar.xz forums-b7ede06835ba784b81365946f057adf75ae7592b.zip | |
[feature/twig] Make style dependency optional for resolver
PHPBB3-11598
Diffstat (limited to 'phpBB/includes/controller')
| -rw-r--r-- | phpBB/includes/controller/resolver.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/controller/resolver.php b/phpBB/includes/controller/resolver.php index e44aa14b55..95dfc8da8e 100644 --- a/phpBB/includes/controller/resolver.php +++ b/phpBB/includes/controller/resolver.php @@ -50,7 +50,7 @@ class phpbb_controller_resolver implements ControllerResolverInterface * @param ContainerInterface $container ContainerInterface object * @param phpbb_style $style */ - public function __construct(phpbb_user $user, ContainerInterface $container, phpbb_style $style) + public function __construct(phpbb_user $user, ContainerInterface $container, phpbb_style $style = null) { $this->user = $user; $this->container = $container; @@ -96,7 +96,7 @@ class phpbb_controller_resolver implements ControllerResolverInterface $controller_dir = explode('_', get_class($controller_object)); // 0 phpbb, 1 ext, 2 vendor, 3 extension name, ... - if (isset($controller_dir[3]) && $controller_dir[1] === 'ext') + if (!is_null($this->style) && isset($controller_dir[3]) && $controller_dir[1] === 'ext') { $controller_style_dir = 'ext/' . $controller_dir[2] . '/' . $controller_dir[3] . '/styles'; |