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

[ticket/11103] Fix merge conflict

Browse source 
PHPBB3-11103
This commit is contained in:
Nathaniel Guse 2012-12-26 11:09:03 -06:00
parent 148463d586
commit bf93dceb1f
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
phpBB/includes/notification/manager.php
View file

@ -128,13 +128,8 @@ class phpbb_notification_manager
$sql = 'SELECT COUNT(n.notification_id) AS unread_count $sql = 'SELECT COUNT(n.notification_id) AS unread_count
FROM ' . $this->notifications_table . ' n, ' . $this->notification_types_table . ' nt FROM ' . $this->notifications_table . ' n, ' . $this->notification_types_table . ' nt
WHERE n.user_id = ' . (int) $options['user_id'] . ' WHERE n.user_id = ' . (int) $options['user_id'] . '
<<<<<<< HEAD
AND n.unread = 1
AND nt.notification_type = n.item_type
=======
AND n.notification_read = 0 AND n.notification_read = 0
AND nt.notification_type = n.notification_type AND nt.notification_type = n.item_type
>>>>>>> 5cedca0... [ticket/11103] unread -> notification_read
AND nt.notification_type_enabled = 1'; AND nt.notification_type_enabled = 1';
$result = $this->db->sql_query($sql); $result = $this->db->sql_query($sql);
$unread_count = (int) $this->db->sql_fetchfield('unread_count', $result); $unread_count = (int) $this->db->sql_fetchfield('unread_count', $result);