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

Gemfile.lock

@@ -158,7 +158,7 @@ GEM
     raindrops (0.13.0)
     rake (10.3.2)
     ref (1.0.5)
-    rmagick (2.13.2)
+    rmagick (2.13.3)
     ruby-prof (0.14.2)
     safe_yaml (1.0.2)
     sanitize (2.1.0)

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

config/danbooru_default_config.rb

@@ -4,7 +4,7 @@ module Danbooru
   class Configuration
     # The version of this Danbooru.
     def version
-      "2.59.0"
+      "2.60.0"
     end
 
     # The name of this Danbooru.

db/structure.sql

@@ -6253,13 +6253,6 @@ CREATE INDEX index_forum_subscriptions_on_user_id ON forum_subscriptions USING b
 CREATE INDEX index_forum_topic_visits_on_forum_topic_id ON forum_topic_visits USING btree (forum_topic_id);
 
 
---
--- Name: index_forum_topic_visits_on_last_read_at; Type: INDEX; Schema: public; Owner: -; Tablespace: 
---
-
-CREATE INDEX index_forum_topic_visits_on_last_read_at ON forum_topic_visits USING btree (last_read_at);
-
-
 --
 -- Name: index_forum_topic_visits_on_user_id; Type: INDEX; Schema: public; Owner: -; Tablespace: 
 --

test/unit/dtext_test.rb

@@ -170,6 +170,6 @@ class DTextTest < ActiveSupport::TestCase
   end
 
   def test_forum_links
-    assert_equal('<p><a href="/forum_topics/1234?page=4">topic #1234</a></p>', p("topic #1234/p4"))
+    assert_equal('<p><a href="/forum_topics/1234?page=4">topic #1234/p4</a></p>', p("topic #1234/p4"))
   end
 end