aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/session.php
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/includes/session.php')
-rw-r--r--phpBB/includes/session.php36
1 files changed, 16 insertions, 20 deletions
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
index 6dad068ecb..2fd2efe9b2 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -1568,9 +1568,9 @@ 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;
+ global $db, $style, $template, $config, $auth, $phpEx, $phpbb_root_path, $cache;
if ($this->data['user_id'] != ANONYMOUS)
{
@@ -1643,40 +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 s.style_id, t.template_path, t.template_id, t.bbcode_bitfield, t.template_inherits_id, t.template_inherit_path, c.theme_path, c.theme_name, c.theme_id
- FROM ' . STYLES_TABLE . ' s, ' . STYLES_TEMPLATE_TABLE . ' t, ' . STYLES_THEME_TABLE . " c
- WHERE s.style_id = $style
- AND t.template_id = s.template_id
- AND c.theme_id = s.theme_id";
+ $sql = 'SELECT *
+ FROM ' . STYLES_TABLE . " s
+ 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 s.style_id, t.template_path, t.template_id, t.bbcode_bitfield, c.theme_path, c.theme_name, c.theme_id
- FROM ' . STYLES_TABLE . ' s, ' . STYLES_TEMPLATE_TABLE . ' t, ' . STYLES_THEME_TABLE . " c
- WHERE s.style_id = $style
- AND t.template_id = s.template_id
- AND c.theme_id = s.theme_id";
+ $sql = 'SELECT *
+ FROM ' . STYLES_TABLE . " s
+ WHERE s.style_id = $style_id";
$result = $db->sql_query($sql, 3600);
$this->theme = $db->sql_fetchrow($result);
$db->sql_freeresult($result);
@@ -1708,7 +1704,7 @@ class user extends session
}
}
- $template->set_template();
+ $style->set_style();
$this->img_lang = $this->lang_name;