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

[feature/merging-style-components] Updating PHP files

Browse Source 
Removing theme and template entries in all files, except for acp styles section

PHPBB3-10632
This commit is contained in:
Vjacheslav Trushkin
2012-03-14 23:24:16 +02:00
parent 234e5d6402
commit ae7d290a22
2 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
phpBB/includes/session.php
View File

@@ -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);