diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-07-09 16:23:57 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-07-09 16:23:57 +0000 |
| commit | 46af817cb058e2eecd89081af4a40075426a32ef (patch) | |
| tree | d27156cb086223b91b8c67f23db969a980e1b7b8 /phpBB/includes/functions_display.php | |
| parent | 455add06f29400af3176eea7c4958ed772934460 (diff) | |
| download | forums-46af817cb058e2eecd89081af4a40075426a32ef.tar forums-46af817cb058e2eecd89081af4a40075426a32ef.tar.gz forums-46af817cb058e2eecd89081af4a40075426a32ef.tar.bz2 forums-46af817cb058e2eecd89081af4a40075426a32ef.tar.xz forums-46af817cb058e2eecd89081af4a40075426a32ef.zip | |
- tackle some usability issues
- fix bug #3147
- added the lock-images made by SHS`
- fixed MSSQL errors (adding the correct ESCAPE sequence)
git-svn-id: file:///svn/phpbb/trunk@6161 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_display.php')
| -rw-r--r-- | phpBB/includes/functions_display.php | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php index eec11408dd..515246461b 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -637,21 +637,44 @@ function topic_status(&$topic_row, $replies, $unread_topic, &$folder_img, &$fold $topic_type = $user->lang['VIEW_TOPIC_GLOBAL']; $folder = 'folder_global'; $folder_new = 'folder_global_new'; + + if ($topic_row['topic_status'] == ITEM_LOCKED) + { + $topic_type = $user->lang['VIEW_TOPIC_LOCKED']; + $folder = 'folder_locked_global'; + $folder_new = 'folder_locked_global_new'; + } break; case POST_ANNOUNCE: $topic_type = $user->lang['VIEW_TOPIC_ANNOUNCEMENT']; $folder = 'folder_announce'; $folder_new = 'folder_announce_new'; + + if ($topic_row['topic_status'] == ITEM_LOCKED) + { + $topic_type = $user->lang['VIEW_TOPIC_LOCKED']; + $folder = 'folder_locked_announce'; + $folder_new = 'folder_locked_announce_new'; + } break; case POST_STICKY: $topic_type = $user->lang['VIEW_TOPIC_STICKY']; $folder = 'folder_sticky'; $folder_new = 'folder_sticky_new'; + + if ($topic_row['topic_status'] == ITEM_LOCKED) + { + $topic_type = $user->lang['VIEW_TOPIC_LOCKED']; + $folder = 'folder_locked_sticky'; + $folder_new = 'folder_locked_sticky_new'; + } break; default: + $topic_type = ''; + if ($config['hot_threshold'] && $replies >= $config['hot_threshold']) { $folder = 'folder_hot'; |