diff options
| author |   3D-I <480857+3D-I@users.noreply.github.com> | 2019-09-22 20:10:53 +0200 |
|---|---|---|
| committer | 3D-I <480857+3D-I@users.noreply.github.com> | 2019-09-22 20:12:08 +0200 |
| commit | 942bfd65065e753cc602cce4976c7076aba4e7cb (patch) | |
| tree | 3703ba414b12f2b50cd7867b8c73713e0b7a0eee /phpBB/phpbb | |
| parent | [ticket/16144] Provide extra fallback to board's default style for $user (diff) | |
| download | phpbb-942bfd65065e753cc602cce4976c7076aba4e7cb.tar.gz phpbb-942bfd65065e753cc602cce4976c7076aba4e7cb.tar.bz2 phpbb-942bfd65065e753cc602cce4976c7076aba4e7cb.zip | |
[ticket/16144] As per request
PHPBB3-16144
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/user.php | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/phpBB/phpbb/user.php b/phpBB/phpbb/user.php index 8e2b278650..e6e8e7f167 100644 --- a/phpBB/phpbb/user.php +++ b/phpBB/phpbb/user.php @@ -281,13 +281,10 @@ class user extends \phpbb\session $db->sql_freeresult($result); } - /** - * Something went very bad this time. - * Fallback to board's default style upon its strict verification. - */ + // Fallback to board's default style if (!$this->style) { - /** Verify default style exists in the database */ + // Verify default style exists in the database $sql = 'SELECT style_id FROM ' . STYLES_TABLE . ' WHERE style_id = ' . (int) $config['default_style']; @@ -295,13 +292,11 @@ class user extends \phpbb\session $style_id = (int) $db->sql_fetchfield('style_id'); $db->sql_freeresult($result); - $style_id = $style_id ?: false; - if ($style_id > 0) { $db->sql_transaction('begin'); - /** Update $user row */ + // Update $user row $sql = 'SELECT * FROM ' . STYLES_TABLE . ' WHERE style_id = ' . (int) $config['default_style']; @@ -309,7 +304,7 @@ class user extends \phpbb\session $this->style = $db->sql_fetchrow($result); $db->sql_freeresult($result); - /** Update user style preference */ + // Update user style preference $sql = 'UPDATE ' . USERS_TABLE . ' SET user_style = ' . (int) $style_id . ' WHERE user_id = ' . (int) $this->data['user_id']; @@ -319,7 +314,7 @@ class user extends \phpbb\session } } - /** This should never happens */ + // This should never happens if (!$this->style) { trigger_error($this->language->lang('NO_STYLE_DATA', $this->data['user_style'], $this->data['user_id']), E_USER_ERROR); |