diff options
| author | Vjacheslav Trushkin <arty@phpbb.com> | 2012-03-15 13:41:23 +0200 |
|---|---|---|
| committer | Vjacheslav Trushkin <arty@phpbb.com> | 2012-03-15 13:41:23 +0200 |
| commit | c83f386c923fdb0e2823e7f742561a44a6f0f6ed (patch) | |
| tree | bc780212ef561766ec901b66b59b40ac7675e4ea /phpBB/includes | |
| parent | 3997ffac2a2e6f422dcd5cd5bd076edee6fa91dd (diff) | |
| download | forums-c83f386c923fdb0e2823e7f742561a44a6f0f6ed.tar forums-c83f386c923fdb0e2823e7f742561a44a6f0f6ed.tar.gz forums-c83f386c923fdb0e2823e7f742561a44a6f0f6ed.tar.bz2 forums-c83f386c923fdb0e2823e7f742561a44a6f0f6ed.tar.xz forums-c83f386c923fdb0e2823e7f742561a44a6f0f6ed.zip | |
[feature/merging-style-components] Changing $style to $style_id
Changing $style to $style_id in user::setup to avoid conflict with new global style variable
PHPBB3-10632
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/session.php | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php index cd6f17154a..f2956243e2 100644 --- a/phpBB/includes/session.php +++ b/phpBB/includes/session.php @@ -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); |