aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2014-07-26 22:50:06 +0200
committerAndreas Fischer <bantu@phpbb.com>2014-07-26 22:50:06 +0200
commit155f709e36fab1771b4fed91899e4fae625238b8 (patch)
tree3f5bfa70f2785567307c99e96bc29750cfff83ef
parent9d6ff36c6c32bae8d9cddf60bdaa0f36b5f1f266 (diff)
parentd9a62a7333a4476634212261f4d334c3d8d00831 (diff)
downloadforums-155f709e36fab1771b4fed91899e4fae625238b8.tar
forums-155f709e36fab1771b4fed91899e4fae625238b8.tar.gz
forums-155f709e36fab1771b4fed91899e4fae625238b8.tar.bz2
forums-155f709e36fab1771b4fed91899e4fae625238b8.tar.xz
forums-155f709e36fab1771b4fed91899e4fae625238b8.zip
Merge pull request #2777 from Nicofuma/ticket/12881
[ticket/12881] Debug error - Undefined index: mark_time * Nicofuma/ticket/12881: [ticket/12881] Checks earlier if server-side topic marking is enabled
-rw-r--r--phpBB/viewforum.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index c9623293c6..9086feb390 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -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 . '