mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.2.x'

Browse Source
This commit is contained in:
Marc Alexander
2017-10-22 10:19:35 +02:00
parent e7fa0de888 3b5c624c03
commit d11db17e2c
5 changed files with 60 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
phpBB/phpbb/user.php
View File

@@ -278,24 +278,6 @@ class user extends \phpbb\session
$db->sql_freeresult($result);
}
// User has wrong style
if (!$this->style && $style_id == $this->data['user_style'])
{
$style_id = $this->data['user_style'] = $config['default_style'];
$sql = 'UPDATE ' . USERS_TABLE . "
SET user_style = $style_id
WHERE user_id = {$this->data['user_id']}";
$db->sql_query($sql);
$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);
}
if (!$this->style)
{
trigger_error('NO_STYLE_DATA', E_USER_ERROR);