diff options
| author | David M <davidmj@users.sourceforge.net> | 2007-07-21 04:02:41 +0000 |
|---|---|---|
| committer | David M <davidmj@users.sourceforge.net> | 2007-07-21 04:02:41 +0000 |
| commit | 358fba6b2fa9795e0d03e5b7ffb3edd3dfe309e4 (patch) | |
| tree | 3aab0f15ebc0411190ab1b8beaeffd85d69b69b9 | |
| parent | 0e8605fbe21dc767d40a18121da571ee075fe1f1 (diff) | |
| download | forums-358fba6b2fa9795e0d03e5b7ffb3edd3dfe309e4.tar forums-358fba6b2fa9795e0d03e5b7ffb3edd3dfe309e4.tar.gz forums-358fba6b2fa9795e0d03e5b7ffb3edd3dfe309e4.tar.bz2 forums-358fba6b2fa9795e0d03e5b7ffb3edd3dfe309e4.tar.xz forums-358fba6b2fa9795e0d03e5b7ffb3edd3dfe309e4.zip | |
clean up
git-svn-id: file:///svn/phpbb/trunk@7914 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/includes/functions.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/session.php | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index e46afeb0fb..9a97bd7ece 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -4177,8 +4177,6 @@ function page_header($page_title = '', $display_online_list = true) 'SITE_LOGO_IMG' => $user->img('site_logo')) ); - $user->theme['theme_data'] = ''; - // application/xhtml+xml not used because of IE header('Content-type: text/html; charset=UTF-8'); diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php index d81b3ab506..b8b8564496 100644 --- a/phpBB/includes/session.php +++ b/phpBB/includes/session.php @@ -1286,7 +1286,7 @@ class user extends session $style = ($style) ? $style : ((!$config['override_user_style'] && $this->data['user_id'] != ANONYMOUS) ? $this->data['user_style'] : $config['default_style']); } - $sql = 'SELECT s.style_id, t.template_storedb, t.template_path, t.template_id, 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, 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 @@ -1306,7 +1306,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, 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, 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 |