BUGFIX: category name is reserved in multisite

2025-03-23 10:45:41 +08:00 · 2014-04-24 09:19:59 +10:00 · 2014-04-24 09:19:59 +10:00 · 759f4b4fe9
commit 759f4b4fe9
parent ee8bbadfe8
1 changed files with 11 additions and 7 deletions
--- a/app/models/topic.rb
+++ b/app/models/topic.rb
@ -55,7 +55,11 @@ class Topic < ActiveRecord::Base
                                        :case_sensitive => false,
                                        :collection => Proc.new{ Topic.listable_topics } }

-  validates :category_id, :presence => true ,:exclusion => {:in => [SiteSetting.uncategorized_category_id]},
+  validates :category_id,
+            :presence => true,
+            :exclusion => {
+              :in => Proc.new{[SiteSetting.uncategorized_category_id]}
+            },
            :if => Proc.new { |t|
                   (t.new_record? || t.category_id_changed?) &&
                   !SiteSetting.allow_uncategorized_topics &&