aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/session.php
diff options
context:
space:
mode:
authorHenry Sudhof <kellanved@phpbb.com>2008-07-28 14:24:37 +0000
committerHenry Sudhof <kellanved@phpbb.com>2008-07-28 14:24:37 +0000
commiteda1d40861fb5a2b74e7e5ade618cc9fa83cafd1 (patch)
tree14514edf6dc3f86506779b4e8a9d183d88b4ce9c /phpBB/includes/session.php
parent6b07f206d581c1404c15875eabd73b9a3d46a826 (diff)
downloadforums-eda1d40861fb5a2b74e7e5ade618cc9fa83cafd1.tar
forums-eda1d40861fb5a2b74e7e5ade618cc9fa83cafd1.tar.gz
forums-eda1d40861fb5a2b74e7e5ade618cc9fa83cafd1.tar.bz2
forums-eda1d40861fb5a2b74e7e5ade618cc9fa83cafd1.tar.xz
forums-eda1d40861fb5a2b74e7e5ade618cc9fa83cafd1.zip
Okay. Frozen, we never said anything about it being permafrost. Also, this is not 100% tested, expect troubel with store_db (I'm waiting for the bug reports)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8697 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/session.php')
-rw-r--r--phpBB/includes/session.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
index b2a9bd2559..30101c7411 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -1480,7 +1480,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_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, 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