diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2003-02-26 00:37:43 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2003-02-26 00:37:43 +0000 |
| commit | 5b0d02baa25a9b555d925054d6493a48f409a029 (patch) | |
| tree | 77890e56c2545100b401e88f3335d6691f76ff73 /phpBB/viewforum.php | |
| parent | dca34f5db988b18507a87974e93d416c0c372bda (diff) | |
| download | forums-5b0d02baa25a9b555d925054d6493a48f409a029.tar forums-5b0d02baa25a9b555d925054d6493a48f409a029.tar.gz forums-5b0d02baa25a9b555d925054d6493a48f409a029.tar.bz2 forums-5b0d02baa25a9b555d925054d6493a48f409a029.tar.xz forums-5b0d02baa25a9b555d925054d6493a48f409a029.zip | |
Generally related to post tables merge
git-svn-id: file:///svn/phpbb/trunk@3538 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/viewforum.php')
| -rw-r--r-- | phpBB/viewforum.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index 53ef269ddc..99d95ec966 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -237,7 +237,7 @@ if ($forum_data['forum_postable']) 'FOLDER_ANNOUNCE_IMG' => $user->img('folder_announce', 'POST_ANNOUNCEMENT'), 'FOLDER_ANNOUNCE_NEW_IMG'=> $user->img('folder_announce_new', 'POST_ANNOUNCEMENT'), - 'L_NO_TOPICS' => ($forum_data['forum_status'] == ITEM_LOCKED) ? $user->lang['FORUM_LOCKED'] : $user->lang['NO_TOPICS'], + 'L_NO_TOPICS' => ($forum_data['forum_status'] == ITEM_LOCKED) ? $user->lang['POST_FORUM_LOCKED'] : $user->lang['NO_TOPICS'], 'S_IS_POSTABLE' => TRUE, 'S_SELECT_SORT_DIR' => $s_sort_dir, @@ -386,8 +386,7 @@ if ($forum_data['forum_postable']) $unread_topic = true; if ($user->data['user_id'] != ANONYMOUS && ($row['topic_last_post_time'] <= $row['lastread_time'] || - $row['topic_last_post_time'] < (time() - $config['lastread']) || - $row['topic_last_post_time'] < $forum_row['lastread_time']) + $row['topic_last_post_time'] < (time() - $config['lastread'])) ) { $unread_topic = false; |