aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/user.php
diff options
context:
space:
mode:
authorOliver Schramm <oliver.schramm97@gmail.com>2014-03-15 22:00:48 +0100
committerOliver Schramm <oliver.schramm97@gmail.com>2014-03-15 22:00:48 +0100
commitdf0ac9876c794be0bfc49bfdcfd50366afa88d49 (patch)
treea06f39071301effacbf7dc2aa4b160d11c42a886 /phpBB/phpbb/user.php
parent325931a56bcaf23fb8bb3e1e3395ed739714f5d9 (diff)
downloadforums-df0ac9876c794be0bfc49bfdcfd50366afa88d49.tar
forums-df0ac9876c794be0bfc49bfdcfd50366afa88d49.tar.gz
forums-df0ac9876c794be0bfc49bfdcfd50366afa88d49.tar.bz2
forums-df0ac9876c794be0bfc49bfdcfd50366afa88d49.tar.xz
forums-df0ac9876c794be0bfc49bfdcfd50366afa88d49.zip
[ticket/11071] Add fallback if requested style don't exist
PHPBB3-11071
Diffstat (limited to 'phpBB/phpbb/user.php')
-rw-r--r--phpBB/phpbb/user.php13
1 files changed, 13 insertions, 0 deletions
diff --git a/phpBB/phpbb/user.php b/phpBB/phpbb/user.php
index 2a7cc602da..6c060e21ea 100644
--- a/phpBB/phpbb/user.php
+++ b/phpBB/phpbb/user.php
@@ -204,6 +204,19 @@ class user extends \phpbb\session
$this->style = $db->sql_fetchrow($result);
$db->sql_freeresult($result);
+ // Fallback to user's standard style
+ if (!$this->style && $style_id != $this->data['user_style'])
+ {
+ $style_id = $this->data['user_style'];
+
+ $sql = 'SELECT *
+ FROM ' . STYLES_TABLE . " s
+ WHERE s.style_id = $style_id";
+ $result = $db->sql_query($sql, 3600);
+ $this->style = $db->sql_fetchrow($result);
+ $db->sql_freeresult($result);
+ }
+
// User has wrong style
if (!$this->style && $style_id == $this->data['user_style'])
{