diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-09-11 17:45:21 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-09-11 17:45:21 +0000 |
| commit | 8d6b32645c7b3e928f01d3faf29e5e9fb1c89129 (patch) | |
| tree | 3590e6c1f1df1c25bbd5d134201c6e03cec36f43 /app/models | |
| parent | a592d6c40dd8406296ae332dbe3b2dd152648449 (diff) | |
| download | redmine-8d6b32645c7b3e928f01d3faf29e5e9fb1c89129.tar.gz redmine-8d6b32645c7b3e928f01d3faf29e5e9fb1c89129.zip | |
Template error when user's timezone isn't set and UTC timestamps are used (#1889).
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1801 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/user.rb | 2 |
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? |