Allow Groupdate.time_zone to be set to false [skip ci]

Andrew Kane
1 parent f31c9506
Showing 1 changed file with 1 additions and 0 deletions Show diff stats
lib/groupdate/magic.rb
@@ -195,6 +195,7 @@ module Groupdate
     def time_zone
       @time_zone ||= begin
         time_zone = "Etc/UTC" if options[:time_zone] == false
+        time_zone ||= "Etc/UTC" if Groupdate.time_zone == false
         time_zone ||= options[:time_zone] || Groupdate.time_zone || Time.zone || "Etc/UTC"
         time_zone.is_a?(ActiveSupport::TimeZone) ? time_zone : ActiveSupport::TimeZone[time_zone]
       end
...	...	@@ -195,6 +195,7 @@ module Groupdate
195	195	def time_zone
196	196	@time_zone \|\|= begin
197	197	time_zone = "Etc/UTC" if options[:time_zone] == false
	198	+ time_zone \|\|= "Etc/UTC" if Groupdate.time_zone == false
198	199	time_zone \|\|= options[:time_zone] \|\| Groupdate.time_zone \|\| Time.zone \|\| "Etc/UTC"
199	200	time_zone.is_a?(ActiveSupport::TimeZone) ? time_zone : ActiveSupport::TimeZone[time_zone]
200	201	end
...	...