aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/style/style.php
diff options
context:
space:
mode:
authorVjacheslav Trushkin <arty@phpbb.com>2012-03-31 21:20:18 +0300
committerVjacheslav Trushkin <arty@phpbb.com>2012-03-31 21:20:18 +0300
commitb3f46b9565117940b79c7530a1c21336cd072073 (patch)
tree90066a5ac6afdf000eb37eacba2cee0f615477ae /phpBB/includes/style/style.php
parent7e2f16aafa47f8db51a12a293b0616cb75b4d12f (diff)
downloadforums-b3f46b9565117940b79c7530a1c21336cd072073.tar
forums-b3f46b9565117940b79c7530a1c21336cd072073.tar.gz
forums-b3f46b9565117940b79c7530a1c21336cd072073.tar.bz2
forums-b3f46b9565117940b79c7530a1c21336cd072073.tar.xz
forums-b3f46b9565117940b79c7530a1c21336cd072073.zip
[ticket/10735] Changing locator paths structure
Changing locator paths to 2 dimensional array PHPBB3-10735
Diffstat (limited to 'phpBB/includes/style/style.php')
-rw-r--r--phpBB/includes/style/style.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/includes/style/style.php b/phpBB/includes/style/style.php
index 539a2642ee..dc1e71dff6 100644
--- a/phpBB/includes/style/style.php
+++ b/phpBB/includes/style/style.php
@@ -92,6 +92,9 @@ class phpbb_style
$paths[] = $this->get_style_path($dir);
}
+ // Add 'all' path, used as last fallback path by hooks and extensions
+ $paths[] = $this->get_style_path('all');
+
return $this->set_custom_style($style_name, $paths);
}
@@ -113,7 +116,6 @@ class phpbb_style
$this->provider->set_styles($paths);
$this->locator->set_paths($this->provider);
- $this->locator->set_main_style($this->provider->get_main_style_path());
$this->template->cachepath = $this->phpbb_root_path . 'cache/tpl_' . str_replace('_', '-', $name) . '_';