fix problematic merge

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

diff --git a/app/models/node.rb b/app/models/node.rb
index 8b09ffef77d8cd3f4131da9faab05be65c1ac750..230c83882cf12fee4ba8d23e5477cdc0e40729bc 100644 (file)
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -97,7 +97,7 @@ class Node < ActiveRecord::Base
 
     user_display_name_cache = {} if user_display_name_cache.nil?
 
 
     user_display_name_cache = {} if user_display_name_cache.nil?
 

-    if user_display_name_cache and user_display_name_cache[self.user_id]
+    if user_display_name_cache and user_display_name_cache.key?(self.user_id)

       # use the cache if available
     elsif self.user.data_public?
       user_display_name_cache[self.user_id] = self.user.display_name
       # use the cache if available
     elsif self.user.data_public?
       user_display_name_cache[self.user_id] = self.user.display_name