Merge branch 'master' into moderation

[rails.git] / app / models / user.rb

diff --git a/app/models/user.rb b/app/models/user.rb
index 678bbad9de34b0466ec916b34c69af5744af0a36..352c58fb51ae55154aa134be58bc7c02920c7589 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -283,9 +283,7 @@ class User < ActiveRecord::Base
   ##
   # perform a spam check on a user
   def spam_check
-    if status == "active" && spam_score > SPAM_THRESHOLD
-      update(:status => "suspended")
-    end
+    update(:status => "suspended") if status == "active" && spam_score > SPAM_THRESHOLD
   end
 
   ##