aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-08-11 10:24:37 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-08-11 10:24:37 +0000
commitb70a0369af93c881475e1b6176a8e2afd94d3e37 (patch)
tree293be2283a2b128aadb7d423f92ec61eb70563d3 /phpBB/includes
parent09dc8250793c422db8932e789d46badb5e1fe6b5 (diff)
downloadforums-b70a0369af93c881475e1b6176a8e2afd94d3e37.tar
forums-b70a0369af93c881475e1b6176a8e2afd94d3e37.tar.gz
forums-b70a0369af93c881475e1b6176a8e2afd94d3e37.tar.bz2
forums-b70a0369af93c881475e1b6176a8e2afd94d3e37.tar.xz
forums-b70a0369af93c881475e1b6176a8e2afd94d3e37.zip
fixing bug #3702
git-svn-id: file:///svn/phpbb/trunk@6259 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/ucp/ucp_main.php15
1 files changed, 10 insertions, 5 deletions
diff --git a/phpBB/includes/ucp/ucp_main.php b/phpBB/includes/ucp/ucp_main.php
index e0c54cebc5..e0c51204ed 100644
--- a/phpBB/includes/ucp/ucp_main.php
+++ b/phpBB/includes/ucp/ucp_main.php
@@ -51,8 +51,8 @@ class ucp_main
}
$topic_type = $user->lang['VIEW_TOPIC_GLOBAL'];
- $folder = 'folder_global';
- $folder_new = $folder . '_new';
+ $folder = 'global_read';
+ $folder_new = 'global_unread';
// Get cleaned up list... return only those forums not having the f_read permission
$forum_ary = $auth->acl_getf('!f_read', true);
@@ -108,10 +108,15 @@ class ucp_main
$folder_img = ($unread_topic) ? $folder_new : $folder;
$folder_alt = ($unread_topic) ? 'NEW_POSTS' : (($row['topic_status'] == ITEM_LOCKED) ? 'TOPIC_LOCKED' : 'NO_NEW_POSTS');
+ if ($row['topic_status'] == ITEM_LOCKED)
+ {
+ $folder_img .= '_locked';
+ }
+
// Posted image?
if (!empty($row['topic_posted']) && $row['topic_posted'])
{
- $folder_img .= '_posted';
+ $folder_img .= '_mine';
}
$template->assign_block_vars('topicrow', array(
@@ -266,12 +271,12 @@ class ucp_main
// Which folder should we display?
if ($row['forum_status'] == ITEM_LOCKED)
{
- $folder_image = ($unread_forum) ? 'folder_lock_new' : 'folder_lock';
+ $folder_image = ($unread_forum) ? 'forum_unread_locked' : 'forum_read_locked';
$folder_alt = 'FORUM_LOCKED';
}
else
{
- $folder_image = ($unread_forum) ? 'folder_new' : 'folder';
+ $folder_image = ($unread_forum) ? 'forum_unread' : 'forum_read';
$folder_alt = ($unread_forum) ? 'NEW_POSTS' : 'NO_NEW_POSTS';
}