diff options
author | Meik Sievertsen <acydburn@phpbb.com> | 2007-09-02 17:24:56 +0000 |
---|---|---|
committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-09-02 17:24:56 +0000 |
commit | cda8083ba73d8884780a3e802b32b0441d2170b0 (patch) | |
tree | 3cd58211ccc477dd3fdde2047721877c623e3723 /phpBB/includes/session.php | |
parent | 83c83e0e6cb6efb6ae408a5b1a7afd77d57a63b4 (diff) | |
download | forums-cda8083ba73d8884780a3e802b32b0441d2170b0.tar forums-cda8083ba73d8884780a3e802b32b0441d2170b0.tar.gz forums-cda8083ba73d8884780a3e802b32b0441d2170b0.tar.bz2 forums-cda8083ba73d8884780a3e802b32b0441d2170b0.tar.xz forums-cda8083ba73d8884780a3e802b32b0441d2170b0.zip |
fixing some bugs
git-svn-id: file:///svn/phpbb/trunk@8075 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/session.php')
-rw-r--r-- | phpBB/includes/session.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php index a029388101..4d2d22a804 100644 --- a/phpBB/includes/session.php +++ b/phpBB/includes/session.php @@ -1284,7 +1284,7 @@ class user extends session else { // Set up style - $style = ($style) ? $style : ((!$config['override_user_style'] && $this->data['user_id'] != ANONYMOUS) ? $this->data['user_style'] : $config['default_style']); + $style = ($style) ? $style : ((!$config['override_user_style']) ? $this->data['user_style'] : $config['default_style']); } $sql = 'SELECT s.style_id, t.template_storedb, t.template_path, t.template_id, t.bbcode_bitfield, c.theme_path, c.theme_name, c.theme_storedb, c.theme_id, i.imageset_path, i.imageset_id, i.imageset_name |