diff options
| author | Vjacheslav Trushkin <arty@phpbb.com> | 2012-03-14 23:24:16 +0200 |
|---|---|---|
| committer | Vjacheslav Trushkin <arty@phpbb.com> | 2012-03-14 23:24:16 +0200 |
| commit | ae7d290a2222455589d1dcbfba650f789acda508 (patch) | |
| tree | 893b2933d0a20cf48a2c74ce299af276181426f9 /phpBB/includes/session.php | |
| parent | 234e5d6402978ba1a7cfbb3d163512657c7b87fc (diff) | |
| download | forums-ae7d290a2222455589d1dcbfba650f789acda508.tar forums-ae7d290a2222455589d1dcbfba650f789acda508.tar.gz forums-ae7d290a2222455589d1dcbfba650f789acda508.tar.bz2 forums-ae7d290a2222455589d1dcbfba650f789acda508.tar.xz forums-ae7d290a2222455589d1dcbfba650f789acda508.zip | |
[feature/merging-style-components] Updating PHP files
Removing theme and template entries in all files, except for acp styles section
PHPBB3-10632
Diffstat (limited to 'phpBB/includes/session.php')
| -rw-r--r-- | phpBB/includes/session.php | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php index 6dad068ecb..cd6f17154a 100644 --- a/phpBB/includes/session.php +++ b/phpBB/includes/session.php @@ -1653,11 +1653,9 @@ class user extends session $style = ($style) ? $style : ((!$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"; $result = $db->sql_query($sql, 3600); $this->theme = $db->sql_fetchrow($result); $db->sql_freeresult($result); @@ -1672,11 +1670,9 @@ class user extends session 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"; $result = $db->sql_query($sql, 3600); $this->theme = $db->sql_fetchrow($result); $db->sql_freeresult($result); |