mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 05:50:42 +02:00
Code Issues Releases Wiki Activity

[feature/twig] Make style dependency optional for resolver

Browse Source 
PHPBB3-11598
This commit is contained in:
Nathaniel Guse
2013-07-04 11:16:44 -05:00
parent 1ce33c1ff6
commit b7ede06835
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/includes/controller/resolver.php
View File

@@ -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';