From bef3314e50e1f38fe53cbaaf47dd09fc46d42f49 Mon Sep 17 00:00:00 2001 From: Bart van Bragt Date: Fri, 14 Dec 2001 02:19:57 +0000 Subject: [PATCH] Announce and Sticky are never shown as locked git-svn-id: file:///svn/phpbb/trunk@1565 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/viewforum.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index 8311a4a8f1..b295bd6f8d 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -470,12 +470,7 @@ if( $total_topics ) } else { - if( $topic_rowset[$i]['topic_status'] == TOPIC_LOCKED ) - { - $folder = $images['folder_locked']; - $folder_new = $images['folder_locked_new']; - } - else if( $topic_rowset[$i]['topic_type'] == POST_ANNOUNCE ) + if( $topic_rowset[$i]['topic_type'] == POST_ANNOUNCE ) { $folder = $images['folder_announce']; $folder_new = $images['folder_announce_new']; @@ -485,6 +480,11 @@ if( $total_topics ) $folder = $images['folder_sticky']; $folder_new = $images['folder_sticky_new']; } + else if( $topic_rowset[$i]['topic_status'] == TOPIC_LOCKED ) + { + $folder = $images['folder_locked']; + $folder_new = $images['folder_locked_new']; + } else { if($replies >= $board_config['hot_threshold']) @@ -643,4 +643,4 @@ $template->pparse("body"); // include($phpbb_root_path . 'includes/page_tail.'.$phpEx); -?> \ No newline at end of file +?>