aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/viewforum.php
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-10-29 13:04:56 +0100
committerJoas Schilling <nickvergessen@gmx.de>2014-10-29 13:42:41 +0100
commitae6a3b03c4c0c46679cc60f597b1c425783cfcaf (patch)
treec559cec901b353a2b83908b599b07f9891c11b36 /phpBB/viewforum.php
parent82aed75b3bae09369c4eea49648c0293f823a02a (diff)
downloadforums-ae6a3b03c4c0c46679cc60f597b1c425783cfcaf.tar
forums-ae6a3b03c4c0c46679cc60f597b1c425783cfcaf.tar.gz
forums-ae6a3b03c4c0c46679cc60f597b1c425783cfcaf.tar.bz2
forums-ae6a3b03c4c0c46679cc60f597b1c425783cfcaf.tar.xz
forums-ae6a3b03c4c0c46679cc60f597b1c425783cfcaf.zip
[ticket/13241] Correctly ignore announcements from topics list
PHPBB3-13241
Diffstat (limited to 'phpBB/viewforum.php')
-rw-r--r--phpBB/viewforum.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index 6379da6802..d881bb88b2 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -504,8 +504,8 @@ if ($start > $topics_count / 2)
// Select the sort order
$direction = (($sort_dir == 'd') ? 'ASC' : 'DESC');
- $sql_limit = $pagination->reverse_limit($start, $sql_limit, $topics_count);
- $sql_start = $pagination->reverse_start($start, $sql_limit, $topics_count);
+ $sql_limit = $pagination->reverse_limit($start, $sql_limit, $topics_count - sizeof($announcement_list));
+ $sql_start = $pagination->reverse_start($start, $sql_limit, $topics_count - sizeof($announcement_list));
}
else
{