From efa2c09b3d5bffe5ffbb4db000c41ba645f9acfc Mon Sep 17 00:00:00 2001
From: Andrew Brown <drusepth@gmail.com>
Date: Mon, 3 Dec 2018 02:33:29 -0600
Subject: [PATCH] fix unread pm count

---
 app/controllers/application_controller.rb                 | 5 ++++-
 .../thredded/messageboards/messageboard/_meta.html.erb    | 8 --------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 9e1af47f..f6542b16 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -59,7 +59,10 @@ class ApplicationController < ActionController::Base
     end
 
     @unread_private_messages = if user_signed_in?
-      Thredded::PrivateTopic.unread(current_user).count
+      Thredded::PrivateTopic
+        .for_user(thredded_current_user)
+        .unread(thredded_current_user)
+        .count
     else
       0
     end
diff --git a/app/views/thredded/messageboards/messageboard/_meta.html.erb b/app/views/thredded/messageboards/messageboard/_meta.html.erb
index 12ea538e..f3452546 100644
--- a/app/views/thredded/messageboards/messageboard/_meta.html.erb
+++ b/app/views/thredded/messageboards/messageboard/_meta.html.erb
@@ -1,11 +1,3 @@
-<%#
-  unread_posts_count = if user_signed_in?
-    messageboard.topics.unread(current_user).count
-  else
-    messageboard.topics_count
-  end
-%>
-
 <div class="thredded--messageboard--meta">
   <% if messageboard.locked? %>
     <span class="thredded--messageboard--meta--locked"