aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/session.php
diff options
context:
space:
mode:
authorChris Smith <toonarmy@phpbb.com>2008-09-04 11:39:25 +0000
committerChris Smith <toonarmy@phpbb.com>2011-09-20 21:06:51 +0100
commit9e4349e7faac65403de02fd090a837fee92b764a (patch)
tree7727f53d3d756508e0baf78c5c3713355b52525b /phpBB/includes/session.php
parent57451a2014bba889ea8fe3c8053c6442948cc728 (diff)
downloadforums-9e4349e7faac65403de02fd090a837fee92b764a.tar
forums-9e4349e7faac65403de02fd090a837fee92b764a.tar.gz
forums-9e4349e7faac65403de02fd090a837fee92b764a.tar.bz2
forums-9e4349e7faac65403de02fd090a837fee92b764a.tar.xz
forums-9e4349e7faac65403de02fd090a837fee92b764a.zip
[feature/remove-db-styles] Removed database storage of style components.
The bulk of database storage of templates is removed, rendering template stored in the database as useless. Theme database storage is reduced to a skeleton for full removal soon. This commit was cherry picked from the old feature/ascraeus-experiment branch the old commit hash is 0dbe7e3b6cd450342d3c566eb2caf36ca1b5db8e. PHPBB3-9741
Diffstat (limited to 'phpBB/includes/session.php')
-rw-r--r--phpBB/includes/session.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
index 206b88a73e..c66bf89b47 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -1655,7 +1655,7 @@ 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_storedb, 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_storedb, c.theme_id
+ $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_storedb, 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
@@ -1674,7 +1674,7 @@ class user extends session
WHERE user_id = {$this->data['user_id']}";
$db->sql_query($sql);
- $sql = 'SELECT s.style_id, t.template_storedb, t.template_path, t.template_id, t.bbcode_bitfield, c.theme_path, c.theme_name, c.theme_storedb, c.theme_id
+ $sql = 'SELECT s.style_id, t.template_path, t.template_id, t.bbcode_bitfield, c.theme_path, c.theme_name, c.theme_storedb, 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