From 197c801746b148e6bcf7b5824e9077c185bf4e5f Mon Sep 17 00:00:00 2001
From: Tristan Darricau <github@nicofuma.fr>
Date: Sun, 11 May 2014 14:10:19 +0200
Subject: [PATCH] [ticket/12529] Use root_path in controller\resolver to check
 the template dir

PHPBB3-12529
---
 phpBB/config/services.yml            |  1 +
 phpBB/phpbb/controller/resolver.php  | 11 +++++++++--
 tests/controller/controller_test.php |  2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml
index fdd8a33135..45ad108ef9 100644
--- a/phpBB/config/services.yml
+++ b/phpBB/config/services.yml
@@ -103,6 +103,7 @@ services:
         class: phpbb\controller\resolver
         arguments:
             - @user
+            - %core.root_path%
             - @service_container
             - @template
 
diff --git a/phpBB/phpbb/controller/resolver.php b/phpBB/phpbb/controller/resolver.php
index 233179e343..f4cebc5730 100644
--- a/phpBB/phpbb/controller/resolver.php
+++ b/phpBB/phpbb/controller/resolver.php
@@ -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'));
 			}
diff --git a/tests/controller/controller_test.php b/tests/controller/controller_test.php
index 7b8b78dd22..630757dfd7 100644
--- a/tests/controller/controller_test.php
+++ b/tests/controller/controller_test.php
@@ -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');