aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/viewforum.php
diff options
context:
space:
mode:
authorPaul S. Owen <psotfx@users.sourceforge.net>2003-03-25 00:05:28 +0000
committerPaul S. Owen <psotfx@users.sourceforge.net>2003-03-25 00:05:28 +0000
commit18294c2230978831241ad6993c5941f13a964af8 (patch)
tree4909a9b958cdfd9ba2e8307b1d59b8be9797a5ac /phpBB/viewforum.php
parent9482bb75ca63c5be50f92a873d9a1818e9cef811 (diff)
downloadforums-18294c2230978831241ad6993c5941f13a964af8.tar
forums-18294c2230978831241ad6993c5941f13a964af8.tar.gz
forums-18294c2230978831241ad6993c5941f13a964af8.tar.bz2
forums-18294c2230978831241ad6993c5941f13a964af8.tar.xz
forums-18294c2230978831241ad6993c5941f13a964af8.zip
Output total posts/topics
git-svn-id: file:///svn/phpbb/trunk@3712 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/viewforum.php')
-rw-r--r--phpBB/viewforum.php8
1 files changed, 5 insertions, 3 deletions
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index cbe33c3ae2..95086e906e 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -192,7 +192,8 @@ if ($forum_data['forum_postable'])
$sql = "SELECT COUNT(topic_id) AS forum_topics
FROM " . TOPICS_TABLE . "
WHERE forum_id = $forum_id
- AND topic_last_post_time >= $min_topic_time";
+ AND topic_last_post_time >= $min_topic_time
+ AND topic_type <> " . POST_ANNOUNCE;
$result = $db->sql_query($sql);
$start = 0;
@@ -215,7 +216,8 @@ if ($forum_data['forum_postable'])
$template->assign_vars(array(
'PAGINATION' => generate_pagination("viewforum.$phpEx$SID&amp;f=$forum_id&amp;st=$sort_days&amp;sk=$sort_key&amp;sd=$sort_dir", $topics_count, $config['topics_per_page'], $start),
'PAGE_NUMBER' => on_page($topics_count, $config['topics_per_page'], $start),
- 'MOD_CP' => ($auth->acl_gets('m_', 'a_', $forum_id)) ? sprintf($user->lang['MCP'], '<a href="mcp.' . $phpEx . '?sid=' . $user->session_id . '&amp;f=' . $forum_id . '">', '</a>') : '',
+ 'TOTAL_TOPICS' => ($topics_count == 1) ? $user->lang['VIEW_FORUM_TOPIC'] : sprintf($user->lang['VIEW_FORUM_TOPICS'], $topics_count),
+ 'MOD_CP' => ($auth->acl_gets('m_', $forum_id)) ? sprintf($user->lang['MCP'], '<a href="mcp.' . $phpEx . '?sid=' . $user->session_id . '&amp;f=' . $forum_id . '">', '</a>') : '',
'MODERATORS' => (!empty($moderators[$forum_id])) ? implode(', ', $moderators[$forum_id]) : $user->lang['NONE'],
'POST_IMG' => (intval($forum_data['forum_status']) == ITEM_LOCKED) ? $user->img('post_locked', $post_alt) : $user->img('post_new', $post_alt),
@@ -288,7 +290,7 @@ if ($forum_data['forum_postable'])
WHERE t.forum_id = $forum_id
" . (($auth->acl_gets('m_approve', 'a_', $forum_id)) ? '' : 'AND t.topic_approved = 1') . "
AND t.topic_type <> " . POST_ANNOUNCE . "
- $limit_topics_time
+ $limit_topics_time
ORDER BY t.topic_type DESC, $sort_order_sql";
/* }
else