diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-07-05 09:57:55 -0500 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-07-05 09:57:55 -0500 |
| commit | c1a600277d07c2dbb3ebd410f87acb22627a9d60 (patch) | |
| tree | ad35dcd9661dd3017101c59e1e35fe09bcb6a3d4 | |
| parent | 576d8d70721f3f6c718339b069e93c33f3a38673 (diff) | |
| download | forums-c1a600277d07c2dbb3ebd410f87acb22627a9d60.tar forums-c1a600277d07c2dbb3ebd410f87acb22627a9d60.tar.gz forums-c1a600277d07c2dbb3ebd410f87acb22627a9d60.tar.bz2 forums-c1a600277d07c2dbb3ebd410f87acb22627a9d60.tar.xz forums-c1a600277d07c2dbb3ebd410f87acb22627a9d60.zip | |
[feature/twig] Nicer code for get_user_style.php()
PHPBB3-11598
| -rw-r--r-- | phpBB/includes/style/style.php | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/phpBB/includes/style/style.php b/phpBB/includes/style/style.php index b0bf3c1019..06c16fdef4 100644 --- a/phpBB/includes/style/style.php +++ b/phpBB/includes/style/style.php @@ -91,11 +91,16 @@ class phpbb_style */ public function get_user_style() { - return array_merge(array( - $this->user->style['style_path'], - ), - ($this->user->style['style_parent_id']) ? array_reverse(explode('/', $this->user->style['style_parent_tree'])) : array() + $style_list = array( + $this->user->style['style_path'], ); + + if ($this->user->style['style_parent_id']) + { + $style_list = array_merge($style_list, array_reverse(explode('/', $this->user->style['style_parent_tree']))); + } + + return $style_list; } /** |