diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-06-14 01:00:38 -0500 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-06-14 01:00:38 -0500 |
| commit | 30a1f21735227a72c8d676db3d0c8d695b150007 (patch) | |
| tree | 5bb56f611ce763e637b30433068d4266ad16c8cc /phpBB/includes/style/style.php | |
| parent | 38d8025f123bed57bf5b75164fc25707b4dd462d (diff) | |
| download | forums-30a1f21735227a72c8d676db3d0c8d695b150007.tar forums-30a1f21735227a72c8d676db3d0c8d695b150007.tar.gz forums-30a1f21735227a72c8d676db3d0c8d695b150007.tar.bz2 forums-30a1f21735227a72c8d676db3d0c8d695b150007.tar.xz forums-30a1f21735227a72c8d676db3d0c8d695b150007.zip | |
[feature/twig] Use twig loader filesystem with namespaces to add paths
Twig now handles loading style files on its own
PHPBB3-11598
Diffstat (limited to 'phpBB/includes/style/style.php')
| -rw-r--r-- | phpBB/includes/style/style.php | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/phpBB/includes/style/style.php b/phpBB/includes/style/style.php index 4703c3a219..5aeeac40e4 100644 --- a/phpBB/includes/style/style.php +++ b/phpBB/includes/style/style.php @@ -135,15 +135,29 @@ class phpbb_style $this->provider->set_styles($paths); $this->locator->set_paths($this->provider); - $this->template->set_style_names($names); - if ($template_path !== false) { $this->locator->set_template_path($template_path); + + $appended_paths = array(); + foreach ($paths as $path) + { + $appended_paths[] = $path . '/' . $template_path; + } + + $this->template->set_style_names($names, $appended_paths); } else { $this->locator->set_default_template_path(); + + $appended_paths = array(); + foreach ($paths as $path) + { + $appended_paths[] = $path . '/template/'; + } + + $this->template->set_style_names($names, $appended_paths); } $this->template->cachepath = $this->phpbb_root_path . 'cache/tpl_' . str_replace('_', '-', $name) . '_'; |