Fixed problems with the relations functional tests.

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

diff --git a/app/models/relation.rb b/app/models/relation.rb
index 081c44b25d13cc45e1fc0172bfda0411558bc90e..dd2d1c7d5f1e4f18e6ae10703e780e8825b0bb69 100644 (file)
--- a/app/models/relation.rb
+++ b/app/models/relation.rb
@@ -77,7 +77,7 @@ class Relation < ActiveRecord::Base
     
     if user_display_name_cache and user_display_name_cache.key?(self.changeset.user_id)
       # use the cache if available
-    elsif self.user.data_public?
+    elsif self.changeset.user.data_public?
       user_display_name_cache[self.changeset.user_id] = self.changeset.user.display_name
     else
       user_display_name_cache[self.changeset.user_id] = nil