1 files changed, 13 insertions, 7 deletions
@@ -249,14 +249,18 @@ class Time
 end
 private :apply_offset
- def make_time(date, year, mon, day, hour, min, sec, sec_fraction, zone, now)
 if !year && !mon && !day && !hour && !min && !sec && !sec_fraction
 raise ArgumentError, "no time information in #{date.inspect}"
 end
- off_year = year || now.year
 off = nil
- off = zone_offset(zone, off_year) if zone
 if off
 now = now.getlocal(off) if now.utc_offset != off
@@ -287,8 +291,10 @@ class Time
 sec ||= 0
 usec ||= 0
- if year != off_year
- off = nil
 off = zone_offset(zone, year) if zone
 end
@@ -363,7 +369,7 @@ class Time
 d = Date._parse(date, comp)
 year = d[:year]
 year = yield(year) if year && !comp
- make_time(date, year, d[:mon], d[:mday], d[:hour], d[:min], d[:sec], d[:sec_fraction], d[:zone], now)
 end
 #
@@ -441,7 +447,7 @@ class Time
 else
 year = d[:year]
 year = yield(year) if year && block_given?
- t = make_time(date, year, d[:mon], d[:mday], d[:hour], d[:min], d[:sec], d[:sec_fraction], d[:zone], now)
 end
 t
 end