Merge branch 'master' of https://github.com/r888888888/danbooru

2014-10-03 14:35:53 -04:00
parent d499bb4d04 2aa8a1cd4b
commit 685d65ffdb
5 changed files with 4 additions and 11 deletions
--- a/app/models/forum_post.rb
+++ b/app/models/forum_post.rb
@@ -208,7 +208,7 @@ class ForumPost < ActiveRecord::Base
  def update_email_notifications
    subscription = ForumSubscription.where(:forum_topic_id => topic_id, :user_id => CurrentUser.user.id).first

-    if receive_email_notifications == "1"
+    if receive_email_notifications == "1" || receive_email_notifications == true
      if subscription
        subscription.update_attribute(:last_read_at, updated_at)
      else