diff options
| author | Nils Adermann <naderman@naderman.de> | 2011-09-01 15:16:21 -0400 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2011-09-29 16:15:54 +0200 |
| commit | e52022c572c6f1a7cbab7e665e4b738f9e084f7f (patch) | |
| tree | 5a325145dbac748d841f08ac0dff7e3ceb860a9b /phpBB/includes/template/path_provider.php | |
| parent | 4d08d769c2c146d0370d7e97b223b1c199412be1 (diff) | |
| download | forums-e52022c572c6f1a7cbab7e665e4b738f9e084f7f.tar forums-e52022c572c6f1a7cbab7e665e4b738f9e084f7f.tar.gz forums-e52022c572c6f1a7cbab7e665e4b738f9e084f7f.tar.bz2 forums-e52022c572c6f1a7cbab7e665e4b738f9e084f7f.tar.xz forums-e52022c572c6f1a7cbab7e665e4b738f9e084f7f.zip | |
[feature/extension-manager] Make sure named styles are loaded from root dir
PHPBB3-10323
Diffstat (limited to 'phpBB/includes/template/path_provider.php')
| -rw-r--r-- | phpBB/includes/template/path_provider.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/phpBB/includes/template/path_provider.php b/phpBB/includes/template/path_provider.php index e6c8b34e15..80e3ef87d7 100644 --- a/phpBB/includes/template/path_provider.php +++ b/phpBB/includes/template/path_provider.php @@ -44,9 +44,11 @@ class phpbb_template_path_provider implements IteratorAggregate, phpbb_template_ * The first element is the main template. * If the path is false, it will be generated from * the supplied name. + * @param string $style_root_path The root directory for styles identified + * by name only. * @return null */ - public function set_templates(array $templates) + public function set_templates(array $templates, $style_root_path) { $this->paths; @@ -54,7 +56,7 @@ class phpbb_template_path_provider implements IteratorAggregate, phpbb_template_ { if (!$path) { - $path = $this->template_root_for_style($name); + $path = $style_root_path . $this->template_root_for_style($name); } $this->paths[] = $path; |