Merge branch '3.3.x'

This commit is contained in:
Marc Alexander 2020-10-24 17:31:22 +02:00
commit 9ce910d50e
No known key found for this signature in database
GPG key ID: 50E0D2423696F995

View file

@ -1028,7 +1028,7 @@ if (count($topic_list))
$template->assign_block_vars('topicrow', $topic_row);
$pagination->generate_template_pagination($view_topic_url, 'topicrow.pagination', 'start', $replies + 1, $config['posts_per_page'], 1, true, true);
$pagination->generate_template_pagination($topic_row['U_VIEW_TOPIC'], 'topicrow.pagination', 'start', $topic_row['REPLIES'] + 1, $config['posts_per_page'], 1, true, true);
$s_type_switch = ($row['topic_type'] == POST_ANNOUNCE || $row['topic_type'] == POST_GLOBAL) ? 1 : 0;