mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 04:23:38 +01:00
Code Issues Releases Wiki Activity

[feature/merging-style-components] Changing $style to $style_id

Browse Source 
Changing $style to $style_id in user::setup to avoid conflict with new global style variable

PHPBB3-10632
This commit is contained in:
Vjacheslav Trushkin 2012-03-15 13:41:23 +02:00
parent 3997ffac2a
commit c83f386c92
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
phpBB/includes/session.php
View File

@ -1568,7 +1568,7 @@ class user extends session
/**
* Setup basic user-specific items (style, language, ...)
*/
function setup($lang_set = false, $style = false)
function setup($lang_set = false, $style_id = false)
{
global $db, $template, $config, $auth, $phpEx, $phpbb_root_path, $cache;
@ -1643,36 +1643,36 @@ class user extends session
{
global $SID, $_EXTRA_URL;
$style = $style_request;
$SID .= '&style=' . $style;
$_EXTRA_URL = array('style=' . $style);
$style_id = $style_request;
$SID .= '&style=' . $style_id;
$_EXTRA_URL = array('style=' . $style_id);
}
else
{
// Set up style
$style = ($style) ? $style : ((!$config['override_user_style']) ? $this->data['user_style'] : $config['default_style']);
$style_id = ($style_id) ? $style_id : ((!$config['override_user_style']) ? $this->data['user_style'] : $config['default_style']);
}
$sql = 'SELECT *
FROM ' . STYLES_TABLE . " s
WHERE s.style_id = $style";
WHERE s.style_id = $style_id";
$result = $db->sql_query($sql, 3600);
$this->theme = $db->sql_fetchrow($result);
$db->sql_freeresult($result);
// User has wrong style
if (!$this->theme && $style == $this->data['user_style'])
if (!$this->theme && $style_id == $this->data['user_style'])
{
$style = $this->data['user_style'] = $config['default_style'];
$style_id = $this->data['user_style'] = $config['default_style'];
$sql = 'UPDATE ' . USERS_TABLE . "
SET user_style = $style
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";
WHERE s.style_id = $style_id";
$result = $db->sql_query($sql, 3600);
$this->theme = $db->sql_fetchrow($result);
$db->sql_freeresult($result);