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

[ticket/12529] Use root_path in controller\resolver to check the template dir

Browse Source 
PHPBB3-12529
This commit is contained in:
Tristan Darricau
2014-05-11 14:10:19 +02:00
parent d4fc060bcd
commit 197c801746
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
phpBB/phpbb/controller/resolver.php
View File

@@ -37,6 +37,12 @@ class resolver implements ControllerResolverInterface
*/
protected $template;
/**
* phpBB root path
* @var string
*/
protected $phpbb_root_path;
/**
* Construct method
*
@@ -44,11 +50,12 @@ class resolver implements ControllerResolverInterface
* @param ContainerInterface $container ContainerInterface object
* @param \phpbb\template\template $template
*/
public function __construct(\phpbb\user $user, ContainerInterface $container, \phpbb\template\template $template = null)
public function __construct(\phpbb\user $user, $phpbb_root_path, ContainerInterface $container, \phpbb\template\template $template = null)
{
$this->user = $user;
$this->container = $container;
$this->template = $template;
$this->phpbb_root_path = $phpbb_root_path;
}
/**
@@ -94,7 +101,7 @@ class resolver implements ControllerResolverInterface
{
$controller_style_dir = 'ext/' . $controller_dir[0] . '/' . $controller_dir[1] . '/styles';
if (is_dir($controller_style_dir))
if (is_dir($this->phpbb_root_path . $controller_style_dir))
{
$this->template->set_style(array($controller_style_dir, 'styles'));
}