diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-11-08 12:22:15 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-11-17 16:42:43 -0500 |
| commit | 729eeef2bf4aad74c8170a54098e6679a1e9fadb (patch) | |
| tree | 16fd5b58bc82c46a9c5c791ad28026252dd99203 /phpBB/includes | |
| parent | 44d6dc4c4ccf969fd3d84f3b39bfd24ecd3a3f9d (diff) | |
| download | forums-729eeef2bf4aad74c8170a54098e6679a1e9fadb.tar forums-729eeef2bf4aad74c8170a54098e6679a1e9fadb.tar.gz forums-729eeef2bf4aad74c8170a54098e6679a1e9fadb.tar.bz2 forums-729eeef2bf4aad74c8170a54098e6679a1e9fadb.tar.xz forums-729eeef2bf4aad74c8170a54098e6679a1e9fadb.zip | |
[feature/template-events] Generate style names array in set_style.
PHPBB3-9550
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/style/style.php | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/phpBB/includes/style/style.php b/phpBB/includes/style/style.php index 9ce96c5da5..6aec5c6ba4 100644 --- a/phpBB/includes/style/style.php +++ b/phpBB/includes/style/style.php @@ -91,16 +91,22 @@ class phpbb_style { $style_path = $this->user->style['style_path']; $style_dirs = ($this->user->style['style_parent_id']) ? array_reverse(explode('/', $this->user->style['style_parent_tree'])) : array(); - $paths = array($this->get_style_path($style_path)); + + $names = array($style_path); foreach ($style_dirs as $dir) { - $paths[] = $this->get_style_path($dir); + $names[] = $dir; } - // Add 'all' path, used as last fallback path by hooks and extensions - $paths[] = $this->get_style_path('all'); + //$names[] = 'all'; + + $paths = array(); + foreach ($names as $name) + { + $paths[] = $this->get_style_path($name); + } - return $this->set_custom_style($style_path, $paths); + return $this->set_custom_style($style_path, $names, $paths); } /** |