diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2017-04-09 14:09:07 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2017-04-09 14:09:07 +0200 |
| commit | 3bf133c96ca34195024feb16bed812aa8dc77184 (patch) | |
| tree | 603aedb7a9626a9fc02f242d844940bcbbc6a2d1 | |
| parent | 827ded82b8110fd2c587d9d7c84731ee7215b166 (diff) | |
| parent | f991a99a14da4d7fc79df9429d6f0e5f6d0f8914 (diff) | |
| download | forums-3bf133c96ca34195024feb16bed812aa8dc77184.tar forums-3bf133c96ca34195024feb16bed812aa8dc77184.tar.gz forums-3bf133c96ca34195024feb16bed812aa8dc77184.tar.bz2 forums-3bf133c96ca34195024feb16bed812aa8dc77184.tar.xz forums-3bf133c96ca34195024feb16bed812aa8dc77184.zip | |
Merge pull request #4778 from marc1706/ticket/15139
[ticket/15139] Assigned 'topics_per_page' before template included
| -rw-r--r-- | phpBB/viewforum.php | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index 1938c25fed..5c51975150 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -146,6 +146,13 @@ 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'); // Dump out the page header and load viewforum template @@ -209,12 +216,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']) { |