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 branch 'develop-ascraeus' into develop

Browse source 
* develop-ascraeus:
  [ticket/12881] Checks earlier if server-side topic marking is enabled
This commit is contained in:
Andreas Fischer 2014-07-26 22:50:07 +02:00
commit d4eec54686
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/viewforum.php
View file

@ -469,11 +469,11 @@ if ($forum_data['forum_type'] == FORUM_POST)
$forum_tracking_info = array();
if ($user->data['is_registered'])
if ($user->data['is_registered'] && $config['load_db_lastread'])
{
$forum_tracking_info[$forum_id] = $forum_data['mark_time'];
if (!empty($global_announce_forums) && $config['load_db_lastread'])
if (!empty($global_announce_forums))
{
$sql = 'SELECT forum_id, mark_time
FROM ' . FORUMS_TRACK_TABLE . '