diff options
Diffstat (limited to 'phpBB/viewforum.php')
| -rw-r--r-- | phpBB/viewforum.php | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index ff1c789900..134ad988bd 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -36,27 +36,28 @@ if (!$forum_id) trigger_error('NO_FORUM'); } +$sql_from = FORUMS_TABLE . ' f'; + // Grab appropriate forum data if ($config['load_db_lastread'] && $user->data['is_registered']) { - $sql_lastread = 'LEFT JOIN ' . FORUMS_TRACK_TABLE . ' ft ON (ft.user_id = ' . $user->data['user_id'] . ' + $sql_from .= ' LEFT JOIN ' . FORUMS_TRACK_TABLE . ' ft ON (ft.user_id = ' . $user->data['user_id'] . ' AND ft.forum_id = f.forum_id)'; $lastread_select = ', ft.mark_time'; } else { - $sql_lastread = $lastread_select = ''; + $lastread_select = ''; $tracking_topics = (isset($_COOKIE[$config['cookie_name'] . '_track'])) ? unserialize(stripslashes($_COOKIE[$config['cookie_name'] . '_track'])) : array(); } if ($user->data['is_registered']) { - $sql_from = ($sql_lastread) ? '((' . FORUMS_TABLE . ' f LEFT JOIN ' . FORUMS_WATCH_TABLE . ' fw ON (fw.forum_id = f.forum_id AND fw.user_id = ' . $user->data['user_id'] . ")) $sql_lastread)" : '(' . FORUMS_TABLE . ' f LEFT JOIN ' . FORUMS_WATCH_TABLE . ' fw ON (fw.forum_id = f.forum_id AND fw.user_id = ' . $user->data['user_id'] . '))'; + $sql_from .= ' LEFT JOIN ' . FORUMS_WATCH_TABLE . ' fw ON (fw.forum_id = f.forum_id AND fw.user_id = ' . $user->data['user_id'] . ')'; $lastread_select .= ', fw.notify_status'; } else { - $sql_from = FORUMS_TABLE . ' f'; } $sql = "SELECT f.* $lastread_select |