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>2008-09-04 11:39:25 +0000
commit0dbe7e3b6cd450342d3c566eb2caf36ca1b5db8e (patch)
tree487aac1350289566636b7d1b9cbb629400145040 /phpBB/includes/session.php
parentf2abefeaed267a405ae1ccafba7ce2a52794fadc (diff)
downloadforums-0dbe7e3b6cd450342d3c566eb2caf36ca1b5db8e.tar
forums-0dbe7e3b6cd450342d3c566eb2caf36ca1b5db8e.tar.gz
forums-0dbe7e3b6cd450342d3c566eb2caf36ca1b5db8e.tar.bz2
forums-0dbe7e3b6cd450342d3c566eb2caf36ca1b5db8e.tar.xz
forums-0dbe7e3b6cd450342d3c566eb2caf36ca1b5db8e.zip
Remove caching of templates from the database completely, themes is cut down ready for a complete chop, and fix the installer :)
git-svn-id: file:///svn/phpbb/trunk@8812 89ea8834-ac86-4346-8a33-228a782c2dd0
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 dc3fd7e142..ac57005b61 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -1488,7 +1488,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, c.theme_path, c.theme_name, c.theme_storedb, c.theme_id, i.imageset_path, i.imageset_id, i.imageset_name
+ $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, i.imageset_path, i.imageset_id, i.imageset_name
FROM ' . STYLES_TABLE . ' s, ' . STYLES_TEMPLATE_TABLE . ' t, ' . STYLES_THEME_TABLE . ' c, ' . STYLES_IMAGESET_TABLE . " i
WHERE s.style_id = $style
AND t.template_id = s.template_id
@@ -1508,7 +1508,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, i.imageset_path, i.imageset_id, i.imageset_name
+ $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, i.imageset_path, i.imageset_id, i.imageset_name
FROM ' . STYLES_TABLE . ' s, ' . STYLES_TEMPLATE_TABLE . ' t, ' . STYLES_THEME_TABLE . ' c, ' . STYLES_IMAGESET_TABLE . " i
WHERE s.style_id = $style
AND t.template_id = s.template_id