diff options
| author | Ludovic Arnaud <ludovic_arnaud@users.sourceforge.net> | 2003-07-02 22:30:34 +0000 |
|---|---|---|
| committer | Ludovic Arnaud <ludovic_arnaud@users.sourceforge.net> | 2003-07-02 22:30:34 +0000 |
| commit | c7322203087998da38f840924a51fd0852d8d75b (patch) | |
| tree | 428516242a4d6b925d4887baa4d5056f21ddd26d /phpBB/viewforum.php | |
| parent | b59698aa102b6e6c3d86cb4ec875386e4b9018a7 (diff) | |
| download | forums-c7322203087998da38f840924a51fd0852d8d75b.tar forums-c7322203087998da38f840924a51fd0852d8d75b.tar.gz forums-c7322203087998da38f840924a51fd0852d8d75b.tar.bz2 forums-c7322203087998da38f840924a51fd0852d8d75b.tar.xz forums-c7322203087998da38f840924a51fd0852d8d75b.zip | |
Updated MCP link, fixed the query the obtain "normal" topics
git-svn-id: file:///svn/phpbb/trunk@4191 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/viewforum.php')
| -rw-r--r-- | phpBB/viewforum.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index 1cec5b663d..e96658d83b 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -334,7 +334,7 @@ if ($forum_data['forum_type'] == FORUM_POST) $sql = "SELECT t.* $sql_select FROM $sql_from WHERE t.forum_id = $forum_id - AND t.topic_type <> " . POST_ANNOUNCE . " + AND t.topic_type NOT IN (" . POST_ANNOUNCE . ', ' . POST_GLOBAL . ") $sql_approved $sql_limit_time ORDER BY t.topic_type DESC, $sql_sort_order"; @@ -540,7 +540,8 @@ if ($forum_data['forum_type'] == FORUM_POST) 'S_TOPIC_REPORTED' => (!empty($row['topic_reported']) && $auth->acl_gets('m_', $forum_id)) ? TRUE : FALSE, 'S_TOPIC_UNAPPROVED' => (!$row['topic_approved'] && $auth->acl_gets('m_approve', $forum_id)) ? TRUE : FALSE, - 'U_VIEW_TOPIC' => $view_topic_url) + 'U_VIEW_TOPIC' => $view_topic_url, + 'U_MCP_REPORT' => "mcp.$phpEx$SID&mode=reports&t=$topic_id") ); $s_type_switch = ($row['topic_type'] == POST_ANNOUNCE || $row['topic_type'] == POST_GLOBAL) ? 1 : 0; |