diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-04-22 15:27:40 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-04-22 15:27:40 +0000 |
| commit | 550f270a0027e67a0eb19d99fbe54d6045696a0b (patch) | |
| tree | c0a38cbb0715d7a17b7226c134568d9392e550da /phpBB/style.php | |
| parent | 782c536c703959c643dc77b846c9617326b2a98e (diff) | |
| download | forums-550f270a0027e67a0eb19d99fbe54d6045696a0b.tar forums-550f270a0027e67a0eb19d99fbe54d6045696a0b.tar.gz forums-550f270a0027e67a0eb19d99fbe54d6045696a0b.tar.bz2 forums-550f270a0027e67a0eb19d99fbe54d6045696a0b.tar.xz forums-550f270a0027e67a0eb19d99fbe54d6045696a0b.zip | |
#10005, #10003, #10001, #9999, #9945, #9965, #9909, #9906, #9877, #9861, #9831, #9830, #9815, #9665, #9624
prosilver adjustments for important announcements in ucp - #9995
MCP fixes for user notes/warnings - #9981
Preserving imageset values on save/edit
find a member link for Mass PM's - #9925
syndicate window.onload events where necessary - #9878
Duplicate topics in forums with announcements - #9840
Email template for forced re-activation - #9808
Topic pagination adjustment - #9763
Changed compose message layout in UCP - #9706, #9702
Fixed inline attachment font size (hopefully)
git-svn-id: file:///svn/phpbb/trunk@7384 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/style.php')
| -rw-r--r-- | phpBB/style.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/phpBB/style.php b/phpBB/style.php index 6a71f86dec..056ff2cce7 100644 --- a/phpBB/style.php +++ b/phpBB/style.php @@ -70,8 +70,8 @@ if ($id && $sid) $config = $cache->obtain_config(); - $sql = "SELECT s.session_id, u.user_lang - FROM {$table_prefix}sessions s, {$table_prefix}users u + $sql = 'SELECT s.session_id, u.user_lang + FROM ' . SESSIONS_TABLE . ' s, ' . USERS_TABLE . " u WHERE s.session_id = '" . $db->sql_escape($sid) . "' AND s.session_user_id = u.user_id"; $result = $db->sql_query($sql); @@ -80,12 +80,12 @@ if ($id && $sid) if ($user) { - $sql = "SELECT s.style_id, c.theme_data, c.theme_path, c.theme_name, c.theme_mtime, i.*, t.template_path - FROM {$table_prefix}styles s, {$table_prefix}styles_template t, {$table_prefix}styles_theme c, {$table_prefix}styles_imageset i - WHERE s.style_id = $id + $sql = 'SELECT s.style_id, c.theme_data, c.theme_path, c.theme_name, c.theme_mtime, i.*, t.template_path + FROM ' . STYLES_TABLE . ' s, ' . STYLES_TEMPLATE_TABLE . ' t, ' . STYLES_THEME_TABLE . ' c, ' . STYLES_IMAGESET_TABLE . ' i + WHERE s.style_id = ' . $id . ' AND t.template_id = s.template_id AND c.theme_id = s.theme_id - AND i.imageset_id = s.imageset_id"; + AND i.imageset_id = s.imageset_id'; $result = $db->sql_query($sql, 300); $theme = $db->sql_fetchrow($result); $db->sql_freeresult($result); |