makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-13 14:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/16144] As per request

Browse source 
PHPBB3-16144
This commit is contained in:
3D-I 2019-09-22 20:10:53 +02:00
parent 3e23adf030
commit 942bfd6506
1 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
phpBB/phpbb/user.php
View file

@ -281,13 +281,10 @@ class user extends \phpbb\session
$db->sql_freeresult($result); $db->sql_freeresult($result);
} }
/** // Fallback to board's default style
* Something went very bad this time.
* Fallback to board's default style upon its strict verification.
*/
if (!$this->style) if (!$this->style)
{ {
/** Verify default style exists in the database */ // Verify default style exists in the database
$sql = 'SELECT style_id $sql = 'SELECT style_id
FROM ' . STYLES_TABLE . ' FROM ' . STYLES_TABLE . '
WHERE style_id = ' . (int) $config['default_style']; WHERE style_id = ' . (int) $config['default_style'];
@ -295,13 +292,11 @@ class user extends \phpbb\session
$style_id = (int) $db->sql_fetchfield('style_id'); $style_id = (int) $db->sql_fetchfield('style_id');
$db->sql_freeresult($result); $db->sql_freeresult($result);
$style_id = $style_id ?: false;
if ($style_id > 0) if ($style_id > 0)
{ {
$db->sql_transaction('begin'); $db->sql_transaction('begin');
/** Update $user row */ // Update $user row
$sql = 'SELECT * $sql = 'SELECT *
FROM ' . STYLES_TABLE . ' FROM ' . STYLES_TABLE . '
WHERE style_id = ' . (int) $config['default_style']; WHERE style_id = ' . (int) $config['default_style'];
@ -309,7 +304,7 @@ class user extends \phpbb\session
$this->style = $db->sql_fetchrow($result); $this->style = $db->sql_fetchrow($result);
$db->sql_freeresult($result); $db->sql_freeresult($result);
/** Update user style preference */ // Update user style preference
$sql = 'UPDATE ' . USERS_TABLE . ' $sql = 'UPDATE ' . USERS_TABLE . '
SET user_style = ' . (int) $style_id . ' SET user_style = ' . (int) $style_id . '
WHERE user_id = ' . (int) $this->data['user_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) if (!$this->style)
{ {
trigger_error($this->language->lang('NO_STYLE_DATA', $this->data['user_style'], $this->data['user_id']), E_USER_ERROR); trigger_error($this->language->lang('NO_STYLE_DATA', $this->data['user_style'], $this->data['user_id']), E_USER_ERROR);