mirror of
https://github.com/phpbb/phpbb.git
synced 2025-04-21 16:22:22 +02:00
[ticket/12529] Use root_path in controller\resolver to check the template dir
PHPBB3-12529
This commit is contained in:
parent
d4fc060bcd
commit
197c801746
@ -103,6 +103,7 @@ services:
|
||||
class: phpbb\controller\resolver
|
||||
arguments:
|
||||
- @user
|
||||
- %core.root_path%
|
||||
- @service_container
|
||||
- @template
|
||||
|
||||
|
@ -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'));
|
||||
}
|
||||
|
@ -68,7 +68,7 @@ class phpbb_controller_controller_test extends phpbb_test_case
|
||||
include(__DIR__.'/phpbb/controller/foo.php');
|
||||
}
|
||||
|
||||
$resolver = new \phpbb\controller\resolver(new \phpbb\user, $container);
|
||||
$resolver = new \phpbb\controller\resolver(new \phpbb\user, dirname(__FILE__) . '/', $container);
|
||||
$symfony_request = new Request();
|
||||
$symfony_request->attributes->set('_controller', 'foo.controller:handle');
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user