Change server_settings to smtp_settings to avoid deprecation warning.

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

diff --git a/app/models/segment.rb b/app/models/segment.rb
index b6f60ec3f9dd9d2c181d229ff85c958fb2e15f31..14949879dc6d3cb98cab74621bb2909034f42ba4 100644 (file)
--- a/app/models/segment.rb
+++ b/app/models/segment.rb
@@ -78,6 +78,8 @@ class Segment < ActiveRecord::Base
     el1['id'] = self.id.to_s
     el1['from'] = self.node_a.to_s
     el1['to'] = self.node_b.to_s
     el1['id'] = self.id.to_s
     el1['from'] = self.node_a.to_s
     el1['to'] = self.node_b.to_s

+
+    user_display_name_cache = {} if user_display_name_cache.nil?

     if user_display_name_cache and user_display_name_cache[self.user_id]
       # use the cache if available
     else
     if user_display_name_cache and user_display_name_cache[self.user_id]
       # use the cache if available
     else