diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2012-12-26 11:09:03 -0600 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2012-12-26 11:09:03 -0600 |
| commit | bf93dceb1f69cddc625b7dbbdf588847660070fa (patch) | |
| tree | ea40d78ffef2e63143f89123840103a4c02245bf /phpBB/includes/notification | |
| parent | 148463d586fa2dd7675b3e387464e02f76a0ccf4 (diff) | |
| download | forums-bf93dceb1f69cddc625b7dbbdf588847660070fa.tar forums-bf93dceb1f69cddc625b7dbbdf588847660070fa.tar.gz forums-bf93dceb1f69cddc625b7dbbdf588847660070fa.tar.bz2 forums-bf93dceb1f69cddc625b7dbbdf588847660070fa.tar.xz forums-bf93dceb1f69cddc625b7dbbdf588847660070fa.zip | |
[ticket/11103] Fix merge conflict
PHPBB3-11103
Diffstat (limited to 'phpBB/includes/notification')
| -rw-r--r-- | phpBB/includes/notification/manager.php | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/phpBB/includes/notification/manager.php b/phpBB/includes/notification/manager.php index fa1fd4b81f..9858cda898 100644 --- a/phpBB/includes/notification/manager.php +++ b/phpBB/includes/notification/manager.php @@ -128,13 +128,8 @@ class phpbb_notification_manager $sql = 'SELECT COUNT(n.notification_id) AS unread_count FROM ' . $this->notifications_table . ' n, ' . $this->notification_types_table . ' nt 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 nt.notification_type = n.notification_type ->>>>>>> 5cedca0... [ticket/11103] unread -> notification_read + AND nt.notification_type = n.item_type AND nt.notification_type_enabled = 1'; $result = $this->db->sql_query($sql); $unread_count = (int) $this->db->sql_fetchfield('unread_count', $result); |