makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4778 from marc1706/ticket/15139

Browse source 
[ticket/15139] Assigned 'topics_per_page' before template included
This commit is contained in:
Marc Alexander 2017-04-09 14:09:07 +02:00
commit 3bf133c96c
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
phpBB/viewforum.php
View file

@ -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'); $phpbb_content_visibility = $phpbb_container->get('content.visibility');
// Dump out the page header and load viewforum template // 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>')); 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 ... // Do the forum Prune thang - cron type job ...
if (!$config['use_system_cron']) if (!$config['use_system_cron'])
{ {