summaryrefslogtreecommitdiffstats
path: root/app/models
diff options
context:
space:
mode:
Diffstat (limited to 'app/models')
-rw-r--r--app/models/user.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb
index 4f82f61b2..132896ad9 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -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?