Adding 'New diary post' link to main Users' diaries page to help logged-in users...

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

diff --git a/app/models/segment.rb b/app/models/segment.rb
index aa4e07887cca2751301954848029dd9be60ead18..6916b79b1ef8ad7eedd631e66f6a2368e8babab4 100644 (file)
--- a/app/models/segment.rb
+++ b/app/models/segment.rb
@@ -59,18 +59,12 @@ class Segment < ActiveRecord::Base
     return segment
   end
 
-  def save_with_history
-    begin
-      Segment.transaction do
-        self.timestamp = Time.now
-        self.save!
-        old_segment = OldSegment.from_segment(self)
-        old_segment.save!
-      end
-
-      return true
-    rescue
-      return nil
+  def save_with_history!
+    Segment.transaction do
+      self.timestamp = Time.now
+      self.save!
+      old_segment = OldSegment.from_segment(self)
+      old_segment.save!
     end
   end
 
@@ -88,7 +82,7 @@ class Segment < ActiveRecord::Base
 
     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