github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-05 14:07:30 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Don't set topic timer for close topics when changing category.

Browse Source 
https://meta.discourse.org/t/moving-a-topic-after-closure-reopens-topic/67659/4
This commit is contained in:
Guo Xiang Tan
2017-08-22 12:54:11 +09:00
parent 2d4d76472d
commit 87994a86ce
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/models/topic.rb
View File

@ -216,7 +216,8 @@ class Topic < ActiveRecord::Base
end
def inherit_auto_close_from_category
if !@ignore_category_auto_close &&
if !self.closed &&
!@ignore_category_auto_close &&
self.category &&
self.category.auto_close_hours &&
!public_topic_timer&.execute_at
@ -1010,7 +1011,7 @@ SQL
topic_timer.status_type = status_type
if time.blank?
topic_timer.trash!(trashed_by: by_user || Discourse.system_user)
topic_timer.trash!(by_user || Discourse.system_user)
return
end