aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/mcp/mcp_topic.php
diff options
context:
space:
mode:
authorCullen Walsh <brainy@phpbb.com>2010-01-19 00:14:31 +0000
committerCullen Walsh <brainy@phpbb.com>2010-01-19 00:14:31 +0000
commitf40418296ac70b182289ff4a929dcf2d661f6ca4 (patch)
tree57522d3f463fd20169f1ed8e7e467c5b7a77135e /phpBB/includes/mcp/mcp_topic.php
parentad14664a3a53c270511bc19392c38b60a2c3e3ff (diff)
downloadforums-f40418296ac70b182289ff4a929dcf2d661f6ca4.tar
forums-f40418296ac70b182289ff4a929dcf2d661f6ca4.tar.gz
forums-f40418296ac70b182289ff4a929dcf2d661f6ca4.tar.bz2
forums-f40418296ac70b182289ff4a929dcf2d661f6ca4.tar.xz
forums-f40418296ac70b182289ff4a929dcf2d661f6ca4.zip
Bug #56285 - Properly calculate posts in a topic in the MCP
Authorised by: bantu git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10428 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/mcp/mcp_topic.php')
-rw-r--r--phpBB/includes/mcp/mcp_topic.php9
1 files changed, 8 insertions, 1 deletions
diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php
index abdb839e7b..9779478330 100644
--- a/phpBB/includes/mcp/mcp_topic.php
+++ b/phpBB/includes/mcp/mcp_topic.php
@@ -106,7 +106,14 @@ function mcp_topic_view($id, $mode, $action)
if ($total == -1)
{
- $total = $topic_info['topic_replies'] + 1;
+ if ($auth->acl_get('m_approve', $topic_info['forum_id']))
+ {
+ $total = $topic_info['topic_replies_real'] + 1;
+ }
+ else
+ {
+ $total = $topic_info['topic_replies'] + 1;
+ }
}
$posts_per_page = max(0, request_var('posts_per_page', intval($config['posts_per_page'])));