diff --git a/app/assets/javascripts/discourse/templates/user/user.js.handlebars b/app/assets/javascripts/discourse/templates/user/user.js.handlebars
index 461b76a6624..8435fbce0d6 100644
--- a/app/assets/javascripts/discourse/templates/user/user.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/user/user.js.handlebars
@@ -28,7 +28,7 @@
{{#link-to 'user.notifications'}}
{{i18n user.notifications}}
- ({{unread_notification_count}})
+ ({{notification_count}})
{{/link-to}}
{{/link-to}}
diff --git a/app/serializers/user_serializer.rb b/app/serializers/user_serializer.rb
index 327c7952614..8f916c9e964 100644
--- a/app/serializers/user_serializer.rb
+++ b/app/serializers/user_serializer.rb
@@ -43,7 +43,7 @@ class UserSerializer < BasicUserSerializer
:suspended_till,
:uploaded_avatar_id,
:badge_count,
- :unread_notification_count,
+ :notification_count,
:has_title_badges,
:edit_history_public,
:custom_fields
@@ -77,7 +77,7 @@ class UserSerializer < BasicUserSerializer
:tracked_category_ids,
:watched_category_ids,
:private_messages_stats,
- :unread_notification_count,
+ :notification_count,
:disable_jump_reply,
:gravatar_avatar_upload_id,
:custom_avatar_upload_id,
@@ -244,8 +244,8 @@ class UserSerializer < BasicUserSerializer
object.badges.where(allow_title: true).count > 0
end
- def unread_notification_count
- Notification.where(user_id: object.id, read: false).count
+ def notification_count
+ Notification.where(user_id: object.id).count
end
def include_edit_history_public?