File tree Expand file tree Collapse file tree 3 files changed +9
-2
lines changed
controllers/common/application Expand file tree Collapse file tree 3 files changed +9
-2
lines changed Original file line number Diff line number Diff line change @@ -106,7 +106,10 @@ def set_session_locale
106
106
# set the current timezone, if the user has it configured.
107
107
#
108
108
def set_session_timezone
109
- Time . zone = current_user . time_zone if logged_in?
109
+ Time . zone = current_user . time_zone
110
+ rescue ArgumentError # invalid string
111
+ Rails . logger . warn "Invalid time zone #{ current_user . time_zone } for user #{ current_user . login } "
112
+ Time . zone = Time . zone_default
110
113
end
111
114
112
115
#
Original file line number Diff line number Diff line change @@ -60,4 +60,8 @@ def real?
60
60
false
61
61
end
62
62
63
+ def time_zone
64
+ Time . zone_default
65
+ end
66
+
63
67
end
Original file line number Diff line number Diff line change @@ -171,7 +171,7 @@ def online?
171
171
end
172
172
173
173
def time_zone
174
- read_attribute ( :time_zone ) || Time . zone_default
174
+ read_attribute ( :time_zone ) . presence || Time . zone_default
175
175
end
176
176
177
177
#
You can’t perform that action at this time.
0 commit comments