r18537@gaspard (orig r1801): jplang | 2008-09-11 19:45:21 +0200

Template error when user's timezone isn't set and UTC timestamps are used (#1889). git-svn-id: http://redmine.rubyforge.org/svn/branches/nbc@1837 e93f8b46-1217-0410-a6f0-8f06a7374b81
2008-09-14 15:32:43 +00:00
parent 4508f1ca91
commit b6f7b138aa
3 changed files with 10 additions and 2 deletions
@@ -144,7 +144,7 @@ class User < ActiveRecord::Base
  end
  
  def time_zone
-    self.pref.time_zone.nil? ? nil : TimeZone[self.pref.time_zone]
+    @time_zone ||= (self.pref.time_zone.blank? ? nil : TimeZone[self.pref.time_zone])
  end
  
  def wants_comments_in_reverse_order?