Load banner config from config/banners.yml

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

diff --git a/app/models/user.rb b/app/models/user.rb
index eae917af8dc26884a1d5e4a998827ea2b9c2ed7b..e255dc2169b1158cb735f4a3afc244223449409a 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -217,8 +217,8 @@ class User < ActiveRecord::Base
 
     score = description.spam_score / 4.0
     score += diary_entries.where("created_at > ?", 1.day.ago).count * 10
-    score += diary_entry_score / diary_entries.length if diary_entries.length > 0
-    score += diary_comment_score / diary_comments.length if diary_comments.length > 0
+    score += diary_entry_score / diary_entries.length unless diary_entries.empty?
+    score += diary_comment_score / diary_comments.length unless diary_comments.empty?
     score -= changeset_score
     score -= trace_score
 
@@ -242,7 +242,7 @@ class User < ActiveRecord::Base
   private
 
   def set_defaults
-    self.creation_time = Time.now.getutc unless self.attribute_present?(:creation_time)
+    self.creation_time = Time.now.getutc unless attribute_present?(:creation_time)
   end
 
   def encrypt_password