Merge remote branch 'core/domain-log-fix' into development

cykod · Oct 6, 2010 · 7581434 · 7581434
2 parents a2ea817 + e8d68a5
commit 7581434
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/app/models/domain_log_entry.rb b/app/models/domain_log_entry.rb
@@ -58,7 +58,7 @@ def action
   end
 
   def user?
-    return self.user_id != nil
+    self.user_id != nil && self.user
   end
 
   def username