From a31c33bb753899c18c239aca9ffd78c3bc092dac Mon Sep 17 00:00:00 2001 From: r888888888 Date: Mon, 24 Nov 2014 17:42:11 -0800 Subject: [PATCH] dont filter out emails from mods --- app/models/dmail_filter.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/dmail_filter.rb b/app/models/dmail_filter.rb index de2d53b61..11109d013 100644 --- a/app/models/dmail_filter.rb +++ b/app/models/dmail_filter.rb @@ -3,7 +3,7 @@ class DmailFilter < ActiveRecord::Base attr_accessible :user_id, :words, :as => [:moderator, :janitor, :contributor, :gold, :member, :anonymous, :default, :builder, :admin] def filtered?(dmail) - dmail.body =~ regexp || dmail.subject =~ regexp + dmail.from.level <= User::Levels::MODERATOR && (dmail.body =~ regexp || dmail.subject =~ regexp) end def regexp