aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBart van Bragt <bartvb@users.sourceforge.net>2001-12-14 02:19:57 +0000
committerBart van Bragt <bartvb@users.sourceforge.net>2001-12-14 02:19:57 +0000
commitbef3314e50e1f38fe53cbaaf47dd09fc46d42f49 (patch)
tree069e1c669df631faafdd8f07f958960e6ee8a53f
parentcec532810a94ba3c1f0bd9ba05746258a67e1c7f (diff)
downloadforums-bef3314e50e1f38fe53cbaaf47dd09fc46d42f49.tar
forums-bef3314e50e1f38fe53cbaaf47dd09fc46d42f49.tar.gz
forums-bef3314e50e1f38fe53cbaaf47dd09fc46d42f49.tar.bz2
forums-bef3314e50e1f38fe53cbaaf47dd09fc46d42f49.tar.xz
forums-bef3314e50e1f38fe53cbaaf47dd09fc46d42f49.zip
Announce and Sticky are never shown as locked
git-svn-id: file:///svn/phpbb/trunk@1565 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/viewforum.php14
1 files 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
+?>