From 6a3d77d76e9a6ee17acbd29da8486742f60a2514 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 1 Apr 2013 10:34:06 +0200
Subject: [PATCH] [ticket/10844] Add phpbb_root_path to
 phpbb_style_extension_path_provider

The phpbb_root_path needs to be removed from the style path, before giving
the path to the finder, because the finder prepends it later again and is
therefor unable to find style files when the root path is not ./

PHPBB3-10844
---
 phpBB/config/services.yml                        |  1 +
 phpBB/includes/bbcode.php                        |  2 +-
 phpBB/includes/functions_messenger.php           |  2 +-
 phpBB/includes/style/extension_path_provider.php | 15 ++++++++++++++-
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml
index b9c71844dc..6b7b3f2f2b 100644
--- a/phpBB/config/services.yml
+++ b/phpBB/config/services.yml
@@ -242,6 +242,7 @@ services:
         arguments:
             - @ext.manager
             - @style.path_provider
+            - %core.root_path%
 
     style.path_provider:
         class: phpbb_style_path_provider
diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php
index e8681420d4..c198abeb54 100644
--- a/phpBB/includes/bbcode.php
+++ b/phpBB/includes/bbcode.php
@@ -133,7 +133,7 @@ class bbcode
 			$this->template_bitfield = new bitfield($user->style['bbcode_bitfield']);
 
 			$style_resource_locator = new phpbb_style_resource_locator();
-			$style_path_provider = new phpbb_style_extension_path_provider($phpbb_extension_manager, new phpbb_style_path_provider());
+			$style_path_provider = new phpbb_style_extension_path_provider($phpbb_extension_manager, new phpbb_style_path_provider(), $phpbb_root_path);
 			$template = new phpbb_template($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator, new phpbb_template_context(), $phpbb_extension_manager);
 			$style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator, $style_path_provider, $template);
 			$style->set_style();
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php
index 821f0d970d..e580f6b675 100644
--- a/phpBB/includes/functions_messenger.php
+++ b/phpBB/includes/functions_messenger.php
@@ -209,7 +209,7 @@ class messenger
 		if (!isset($this->tpl_msg[$template_lang . $template_file]))
 		{
 			$style_resource_locator = new phpbb_style_resource_locator();
-			$style_path_provider = new phpbb_style_extension_path_provider($phpbb_extension_manager, new phpbb_style_path_provider());
+			$style_path_provider = new phpbb_style_extension_path_provider($phpbb_extension_manager, new phpbb_style_path_provider(), $phpbb_root_path);
 			$tpl = new phpbb_template($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator, new phpbb_template_context(), $phpbb_extension_manager);
 			$style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator, $style_path_provider, $tpl);
 
diff --git a/phpBB/includes/style/extension_path_provider.php b/phpBB/includes/style/extension_path_provider.php
index 6976a45ed0..e658abcb42 100644
--- a/phpBB/includes/style/extension_path_provider.php
+++ b/phpBB/includes/style/extension_path_provider.php
@@ -40,17 +40,22 @@ class phpbb_style_extension_path_provider extends phpbb_extension_provider imple
 	*/
 	protected $base_path_provider;
 
+	/** @var string */
+	protected $phpbb_root_path;
+
 	/**
 	* Constructor stores extension manager
 	*
 	* @param phpbb_extension_manager $extension_manager phpBB extension manager
 	* @param phpbb_style_path_provider $base_path_provider A simple path provider
 	*            to provide paths to be located in extensions
+	* @param string		$phpbb_root_path	phpBB root path
 	*/
-	public function __construct(phpbb_extension_manager $extension_manager, phpbb_style_path_provider $base_path_provider)
+	public function __construct(phpbb_extension_manager $extension_manager, phpbb_style_path_provider $base_path_provider, $phpbb_root_path)
 	{
 		parent::__construct($extension_manager);
 		$this->base_path_provider = $base_path_provider;
+		$this->phpbb_root_path = $phpbb_root_path;
 	}
 
 	/**
@@ -91,6 +96,14 @@ class phpbb_style_extension_path_provider extends phpbb_extension_provider imple
 					$directories['style'][] = $path;
 					if ($path && !phpbb_is_absolute($path))
 					{
+						// Remove phpBB root path from the style path,
+						// so the finder is able to find extension styles,
+						// when the root path is not ./
+						if (strpos($path, $this->phpbb_root_path) === 0)
+						{
+							$path = substr($path, strlen($this->phpbb_root_path));
+						}
+
 						$result = $finder->directory('/' . $this->ext_dir_prefix . $path)
 							->get_directories(true, false, true);
 						foreach ($result as $ext => $ext_path)