diff options
author | Meik Sievertsen <acydburn@phpbb.com> | 2006-04-22 16:18:40 +0000 |
---|---|---|
committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-04-22 16:18:40 +0000 |
commit | 856650861f0c454b800fe816ba2592444ef13894 (patch) | |
tree | d73a41902d1d58784c7502c94ce4d03998131e0a /phpBB/includes/ucp/ucp_main.php | |
parent | 68c349fdc1ad29ff3c80961297db31b1e725973f (diff) | |
download | forums-856650861f0c454b800fe816ba2592444ef13894.tar forums-856650861f0c454b800fe816ba2592444ef13894.tar.gz forums-856650861f0c454b800fe816ba2592444ef13894.tar.bz2 forums-856650861f0c454b800fe816ba2592444ef13894.tar.xz forums-856650861f0c454b800fe816ba2592444ef13894.zip |
- removed group settings from roles
- added forum icon in front of forums in permissions acp
- added trace permissions in permission masks (thanks naderman for writing the first code and for the idea... :))
- some bugfixes
- PHP6 fix
git-svn-id: file:///svn/phpbb/trunk@5824 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/ucp/ucp_main.php')
-rw-r--r-- | phpBB/includes/ucp/ucp_main.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/phpBB/includes/ucp/ucp_main.php b/phpBB/includes/ucp/ucp_main.php index cedb1ef091..c5b96ce7b6 100644 --- a/phpBB/includes/ucp/ucp_main.php +++ b/phpBB/includes/ucp/ucp_main.php @@ -551,11 +551,13 @@ class ucp_main $template->assign_block_vars('topicrow', array( 'FORUM_ID' => $forum_id, 'TOPIC_ID' => $topic_id, - 'S_DELETED_TOPIC' => (!$row['topic_id']) ? true : false, 'TOPIC_TITLE' => censor_text($row['topic_title']), 'TOPIC_TYPE' => $topic_type, 'FORUM_NAME' => $row['forum_name'], - + + 'S_DELETED_TOPIC' => (!$row['topic_id']) ? true : false, + 'S_GLOBAL_TOPIC' => (!$forum_id) ? true : false, + 'TOPIC_AUTHOR' => topic_topic_author($row), 'FIRST_POST_TIME' => $user->format_date($row['topic_time']), 'LAST_POST_TIME' => $user->format_date($row['topic_last_post_time']), |