diff options
| author | Cullen Walsh <brainy@phpbb.com> | 2010-01-19 00:14:31 +0000 |
|---|---|---|
| committer | Cullen Walsh <brainy@phpbb.com> | 2010-01-19 00:14:31 +0000 |
| commit | f40418296ac70b182289ff4a929dcf2d661f6ca4 (patch) | |
| tree | 57522d3f463fd20169f1ed8e7e467c5b7a77135e | |
| parent | ad14664a3a53c270511bc19392c38b60a2c3e3ff (diff) | |
| download | forums-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
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/includes/mcp/mcp_topic.php | 9 |
2 files changed, 9 insertions, 1 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 024b439863..c32f72d280 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -137,6 +137,7 @@ <li>[Fix] Do not unsubscribe users from topics replying with quickreply. (Bug #56235)</li> <li>[Fix] Don't submit when pressing enter on preview button. (Bug #54395)</li> <li>[Fix] Load reCAPTCHA over https when using a secure connection to the board. (Bug #55755)</li> + <li>[Fix] Properly paginate unapproved posts in the MCP. (Bug #56285)</li> <li>[Change] Move redirect into a hidden field to avoid issues with mod_security. (Bug #54145)</li> <li>[Change] Log activation through inactive users ACP. (Bug #30145)</li> <li>[Change] Send time of last item instead of current time in ATOM Feeds. (Bug #53305)</li> 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']))); |