aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2009-09-10 08:44:34 +0000
committerAndreas Fischer <bantu@phpbb.com>2009-09-10 08:44:34 +0000
commitab971c59be9eefe86bd53bad5858c6427ccc57eb (patch)
tree89df62741b6f6d44ba47cf3c4b66f45927c5ceeb
parentd20a910b86873c8747715437f78a543f958c6bd3 (diff)
downloadforums-ab971c59be9eefe86bd53bad5858c6427ccc57eb.tar
forums-ab971c59be9eefe86bd53bad5858c6427ccc57eb.tar.gz
forums-ab971c59be9eefe86bd53bad5858c6427ccc57eb.tar.bz2
forums-ab971c59be9eefe86bd53bad5858c6427ccc57eb.tar.xz
forums-ab971c59be9eefe86bd53bad5858c6427ccc57eb.zip
Fix bug #51075 introduced in r10121.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10129 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/includes/functions.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 24dd58c116..092a5d5d86 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -1703,8 +1703,8 @@ function get_unread_topics($user_id = false, $sql_extra = '', $sql_sort = '', $s
'WHERE' => "
(
- (tt.mark_time AND t.topic_last_post_time > tt.mark_time) OR
- (tt.mark_time IS NULL AND ft.mark_time AND t.topic_last_post_time > ft.mark_time) OR
+ (tt.mark_time IS NOT NULL AND t.topic_last_post_time > tt.mark_time) OR
+ (tt.mark_time IS NULL AND ft.mark_time IS NOT NULL AND t.topic_last_post_time > ft.mark_time) OR
(
((tt.mark_time IS NULL AND ft.mark_time IS NULL) OR (tt.mark_time < $last_mark AND ft.mark_time < $last_mark))
AND t.topic_last_post_time > $last_mark