diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2017-04-09 14:10:49 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2017-04-09 14:10:49 +0200 |
| commit | a26e8a1aa4b274bde4250c23a355a380de5234fa (patch) | |
| tree | 8d51c3bb32d1fcc2d8059bf93edb779356cfbe03 | |
| parent | 33a050ade99a02d32e6ea3222135eff5d723a68b (diff) | |
| parent | 3bf133c96ca34195024feb16bed812aa8dc77184 (diff) | |
| download | forums-a26e8a1aa4b274bde4250c23a355a380de5234fa.tar forums-a26e8a1aa4b274bde4250c23a355a380de5234fa.tar.gz forums-a26e8a1aa4b274bde4250c23a355a380de5234fa.tar.bz2 forums-a26e8a1aa4b274bde4250c23a355a380de5234fa.tar.xz forums-a26e8a1aa4b274bde4250c23a355a380de5234fa.zip | |
Merge branch '3.1.x' into 3.2.x
| -rw-r--r-- | phpBB/viewforum.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index 03388c6454..dff965a1ee 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -148,6 +148,12 @@ else } } +// Is a forum specific topic count required? +if ($forum_data['forum_topics_per_page']) +{ + $config['topics_per_page'] = $forum_data['forum_topics_per_page']; +} + /* @var $phpbb_content_visibility \phpbb\content_visibility */ $phpbb_content_visibility = $phpbb_container->get('content.visibility'); @@ -212,12 +218,6 @@ if ($mark_read == 'topics') trigger_error($user->lang['TOPICS_MARKED'] . '<br /><br />' . sprintf($user->lang['RETURN_FORUM'], '<a href="' . $redirect_url . '">', '</a>')); } -// Is a forum specific topic count required? -if ($forum_data['forum_topics_per_page']) -{ - $config['topics_per_page'] = $forum_data['forum_topics_per_page']; -} - // Do the forum Prune thang - cron type job ... if (!$config['use_system_cron']) { |