diff options
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/info_request.rb | 6 | ||||
| -rw-r--r-- | app/models/user.rb | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/app/models/info_request.rb b/app/models/info_request.rb index 6bb98d27c..4bd340c51 100644 --- a/app/models/info_request.rb +++ b/app/models/info_request.rb @@ -884,12 +884,18 @@ public for censor_rule in self.censor_rules censor_rule.apply_to_text!(text) end + for censor_rule in self.user.censor_rules + censor_rule.apply_to_text!(text) + end end def apply_censor_rules_to_binary!(binary) for censor_rule in self.censor_rules censor_rule.apply_to_binary!(binary) end + for censor_rule in self.user.censor_rules + censor_rule.apply_to_binary!(binary) + end end def is_owning_user?(user) diff --git a/app/models/user.rb b/app/models/user.rb index 74785b93e..f3b8aeb10 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -43,6 +43,7 @@ class User < ActiveRecord::Base has_many :track_things, :foreign_key => 'tracking_user_id', :order => 'created_at desc' has_many :comments, :order => 'created_at desc' has_one :profile_photo + has_many :censor_rules, :order => 'created_at desc' attr_accessor :password_confirmation, :no_xapian_reindex validates_confirmation_of :password, :message =>"^Please enter the same password twice" |