aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--phpBB/includes/style/style.php13
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;
}
/**