diff --git a/Gemfile.lock b/Gemfile.lock index 64cb02c0a..d3fe392bb 100644 --- a/Gemfile.lock +++ b/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) diff --git a/app/models/forum_post.rb b/app/models/forum_post.rb index 250d3078f..85f12d521 100644 --- 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 diff --git a/config/danbooru_default_config.rb b/config/danbooru_default_config.rb index 1793e3f49..220767799 100644 --- a/config/danbooru_default_config.rb +++ b/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. diff --git a/db/structure.sql b/db/structure.sql index 9fa7a23af..712035244 100644 --- a/db/structure.sql +++ b/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: -- diff --git a/test/unit/dtext_test.rb b/test/unit/dtext_test.rb index 2126df7e5..d50c18645 100644 --- a/test/unit/dtext_test.rb +++ b/test/unit/dtext_test.rb @@ -170,6 +170,6 @@ class DTextTest < ActiveSupport::TestCase end def test_forum_links - assert_equal('
', p("topic #1234/p4")) + assert_equal('', p("topic #1234/p4")) end end