diff options
| author |   Joas Schilling <nickvergessen@gmx.de> | 2013-04-01 10:34:06 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-04-12 21:35:06 +0200 |
| commit | 6a3d77d76e9a6ee17acbd29da8486742f60a2514 (patch) | |
| tree | 067db6bb17d029b8c34047427b9ae46fc8a9c17f /phpBB/includes/bbcode.php | |
| parent | Merge pull request #1184 from marc1706/ticket/11314 (diff) | |
| download | phpbb-6a3d77d76e9a6ee17acbd29da8486742f60a2514.tar.gz phpbb-6a3d77d76e9a6ee17acbd29da8486742f60a2514.tar.bz2 phpbb-6a3d77d76e9a6ee17acbd29da8486742f60a2514.zip | |
[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
Diffstat (limited to 'phpBB/includes/bbcode.php')
| -rw-r--r-- | phpBB/includes/bbcode.php | 2 |
1 files changed, 1 insertions, 1 deletions
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(); |