diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-06-11 20:33:11 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-06-11 20:33:11 -0400 |
| commit | 436ade19fcef64ea5f5cd399018d0c7e9289452b (patch) | |
| tree | 3a370181e7d0ecf1e83e3e1a140ae1cd763b0299 /phpBB/includes/style/style.php | |
| parent | 1564da616b810c33afaa2ddbebfb0b2a2741ba12 (diff) | |
| parent | 71ca9b4fe69dea8150a5d3c6f30dd177c488ff2b (diff) | |
| download | forums-436ade19fcef64ea5f5cd399018d0c7e9289452b.tar forums-436ade19fcef64ea5f5cd399018d0c7e9289452b.tar.gz forums-436ade19fcef64ea5f5cd399018d0c7e9289452b.tar.bz2 forums-436ade19fcef64ea5f5cd399018d0c7e9289452b.tar.xz forums-436ade19fcef64ea5f5cd399018d0c7e9289452b.zip | |
Merge PR #839 branch 'p/ticket/10743' into develop
* p/ticket/10743:
[ticket/10743] Renaming user->theme
[ticket/10743] Changing obtain_cfg_items
Diffstat (limited to 'phpBB/includes/style/style.php')
| -rw-r--r-- | phpBB/includes/style/style.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/style/style.php b/phpBB/includes/style/style.php index 3f470015f6..8d38deb85c 100644 --- a/phpBB/includes/style/style.php +++ b/phpBB/includes/style/style.php @@ -89,8 +89,8 @@ class phpbb_style */ public function set_style() { - $style_name = $this->user->theme['style_path']; - $style_dirs = ($this->user->theme['style_parent_id']) ? array_reverse(explode('/', $this->user->theme['style_parent_tree'])) : array(); + $style_name = $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_name)); foreach ($style_dirs as $dir) { |