diff options
| author | dougk_ff7 <dougk_ff7@users.sourceforge.net> | 2001-10-16 13:10:09 +0000 |
|---|---|---|
| committer | dougk_ff7 <dougk_ff7@users.sourceforge.net> | 2001-10-16 13:10:09 +0000 |
| commit | fd20e68b5e2226d00cd4097010bc25eb46477f5f (patch) | |
| tree | f7f6f39eb71ef2348de02b773a63b9aa59007972 /phpBB/viewforum.php | |
| parent | a4858256ff68ec2be9e2ee19fd44c7d29be299e2 (diff) | |
| download | forums-fd20e68b5e2226d00cd4097010bc25eb46477f5f.tar forums-fd20e68b5e2226d00cd4097010bc25eb46477f5f.tar.gz forums-fd20e68b5e2226d00cd4097010bc25eb46477f5f.tar.bz2 forums-fd20e68b5e2226d00cd4097010bc25eb46477f5f.tar.xz forums-fd20e68b5e2226d00cd4097010bc25eb46477f5f.zip | |
More changes for global announcements. They no longer require the mode to be set (it works without), posting.php has been updated to reflect replies to announcements in ALL forums, and a admin page for announcements (global) has been added, although it can only link to pages with the true forum and auth permissions. A more refined version will be coming soon
git-svn-id: file:///svn/phpbb/trunk@1222 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/viewforum.php')
| -rw-r--r-- | phpBB/viewforum.php | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index ee8b398f08..975787b547 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -435,18 +435,14 @@ if($total_topics) if($topic_type == POST_ANNOUNCE) { $topic_type = $lang['Topic_Announcement'] . " "; - $is_announcement = TRUE; } else if($topic_type == POST_STICKY) { $topic_type = $lang['Topic_Sticky'] . " "; - $is_announcement = FALSE; } else { - $topic_type = ""; - $is_announcement = FALSE; - } + $topic_type = ""; } if( $topic_rowset[$i]['topic_vote'] ) { @@ -556,14 +552,8 @@ if($total_topics) } } } - if($is_announcement == TRUE) - { - $view_topic_url = append_sid("viewtopic.$phpEx?mode=viewannounce&". POST_FORUM_URL . "=" . $forum_id . "&" . POST_TOPIC_URL . "=$topic_id"); - } - else - { - $view_topic_url = append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id"); - } + + $view_topic_url = append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id"); $topic_poster = $topic_rowset[$i]['username']; $topic_poster_profile_url = append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $topic_rowset[$i]['user_id']); @@ -572,14 +562,7 @@ if($total_topics) $last_post = $last_post_time . "<br />" . $lang['by'] . " "; $last_post .= ( $topic_rowset[$i]['id2'] == ANONYMOUS ) ? $topic_rowset[$i]['user2'] . " " : "<a href=\"" . append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $topic_rowset[$i]['id2']) . "\">" . $topic_rowset[$i]['user2'] . "</a> "; - if($is_announcement == TRUE) - { - $last_post .= "<a href=\"" . append_sid("viewtopic.$phpEx?mode=viewannounce&" . POST_FORUM_URL . "=" . $forum_id . "&" . POST_POST_URL . "=" . $topic_rowset[$i]['topic_last_post_id']) . "#" . $topic_rowset[$i]['topic_last_post_id'] . "\"><img src=\"" . $images['icon_latest_reply'] . "\" border=\"0\" alt=\"" . $lang['View_latest_post'] . "\" /></a>"; - } - else - { - $last_post .= "<a href=\"" . append_sid("viewtopic.$phpEx?" . POST_POST_URL . "=" . $topic_rowset[$i]['topic_last_post_id']) . "#" . $topic_rowset[$i]['topic_last_post_id'] . "\"><img src=\"" . $images['icon_latest_reply'] . "\" border=\"0\" alt=\"" . $lang['View_latest_post'] . "\" /></a>"; - } + $last_post .= "<a href=\"" . append_sid("viewtopic.$phpEx?" . POST_POST_URL . "=" . $topic_rowset[$i]['topic_last_post_id']) . "#" . $topic_rowset[$i]['topic_last_post_id'] . "\"><img src=\"" . $images['icon_latest_reply'] . "\" border=\"0\" alt=\"" . $lang['View_latest_post'] . "\" /></a>"; $views = $topic_rowset[$i]['topic_views']; |