aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp/ucp_main.php
diff options
context:
space:
mode:
authorGraham Eames <grahamje@users.sourceforge.net>2006-06-25 15:23:01 +0000
committerGraham Eames <grahamje@users.sourceforge.net>2006-06-25 15:23:01 +0000
commit2cc905b28eb7213a28c4b64cce359be227222527 (patch)
tree7217b597317d1e82d434380080b5158362c564bf /phpBB/includes/ucp/ucp_main.php
parent43fd5901ae4b245d8d2d38510ab7141bc9685c36 (diff)
downloadforums-2cc905b28eb7213a28c4b64cce359be227222527.tar
forums-2cc905b28eb7213a28c4b64cce359be227222527.tar.gz
forums-2cc905b28eb7213a28c4b64cce359be227222527.tar.bz2
forums-2cc905b28eb7213a28c4b64cce359be227222527.tar.xz
forums-2cc905b28eb7213a28c4b64cce359be227222527.zip
Some changes to the way folder images are handled for "special" topics
git-svn-id: file:///svn/phpbb/trunk@6126 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/ucp/ucp_main.php')
-rw-r--r--phpBB/includes/ucp/ucp_main.php11
1 files changed, 2 insertions, 9 deletions
diff --git a/phpBB/includes/ucp/ucp_main.php b/phpBB/includes/ucp/ucp_main.php
index 6e00a1ed7b..f40e35934f 100644
--- a/phpBB/includes/ucp/ucp_main.php
+++ b/phpBB/includes/ucp/ucp_main.php
@@ -50,8 +50,8 @@ class ucp_main
$sql_select .= ', tt.mark_time';
}
- $topic_type = $user->lang['VIEW_TOPIC_ANNOUNCEMENT'];
- $folder = 'folder_announce';
+ $topic_type = $user->lang['VIEW_TOPIC_GLOBAL'];
+ $folder = 'folder_global';
$folder_new = $folder . '_new';
// Get cleaned up list... return only those forums not having the f_read permission
@@ -105,13 +105,6 @@ class ucp_main
$unread_topic = (isset($topic_tracking_info[$topic_id]) && $row['topic_last_post_time'] > $topic_tracking_info[$topic_id]) ? true : false;
- if ($row['topic_status'] == ITEM_LOCKED)
- {
- $topic_type = $user->lang['VIEW_TOPIC_LOCKED'];
- $folder = 'folder_locked';
- $folder_new = 'folder_locked_new';
- }
-
$folder_img = ($unread_topic) ? $folder_new : $folder;
$folder_alt = ($unread_topic) ? 'NEW_POSTS' : (($row['topic_status'] == ITEM_LOCKED) ? 'TOPIC_LOCKED' : 'NO_NEW_POSTS');