fixes #2325

2014-12-12 17:32:33 -08:00
parent 7175df2099
commit ad22e42e62
2 changed files with 15 additions and 1 deletions
--- a/app/models/dmail_filter.rb
+++ b/app/models/dmail_filter.rb
@@ -11,7 +11,11 @@ class DmailFilter < ActiveRecord::Base
  end

  def filtered?(dmail)
-    dmail.from.level <= User::Levels::MODERATOR && (dmail.body =~ regexp || dmail.subject =~ regexp)
+    dmail.from.level <= User::Levels::MODERATOR && has_filter? && (dmail.body =~ regexp || dmail.subject =~ regexp)
+  end
+
+  def has_filter?
+    !words.strip.empty?
  end

  def regexp