aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib
diff options
context:
space:
mode:
Diffstat (limited to 'activesupport/lib')
-rw-r--r--activesupport/lib/active_support/core_ext/time/zones.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/core_ext/time/zones.rb b/activesupport/lib/active_support/core_ext/time/zones.rb
index 563d522d9a..390d4128a1 100644
--- a/activesupport/lib/active_support/core_ext/time/zones.rb
+++ b/activesupport/lib/active_support/core_ext/time/zones.rb
@@ -46,7 +46,7 @@ module ActiveSupport #:nodoc:
# Returns the simultaneous time in Time.zone
def in_current_time_zone
- in_time_zone(::Time.zone)
+ ::Time.zone ? in_time_zone(::Time.zone) : self
end
# Replaces the existing zone; leaves time value intact. Examples:
@@ -60,7 +60,7 @@ module ActiveSupport #:nodoc:
# Replaces the existing zone to Time.zone; leaves time value intact
def change_time_zone_to_current
- change_time_zone(::Time.zone)
+ ::Time.zone ? change_time_zone(::Time.zone) : self
end
end
end