Fixes #37069 - Fallback to UTC on invalid timezone

theforeman · Jan 19, 2024 · f860546 · f860546
1 parent 30e83c4
commit f860546
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/app/controllers/concerns/foreman/controller/timezone.rb b/app/controllers/concerns/foreman/controller/timezone.rb
@@ -8,6 +8,9 @@ def set_timezone
         client_timezone  = User.current.try(:timezone) || cookies[:timezone]
         Time.zone        = client_timezone if client_timezone.present?
         yield
+      rescue ArgumentError
+        Time.zone = ActiveSupport::TimeZone['UTC']
+        yield
       ensure
         # Reset timezone for the next thread
         Time.zone = default_timezone