Skip to content

Commit

Permalink
Applied 00a64be to lib/19/time.rb
Browse files Browse the repository at this point in the history
  • Loading branch information
brixen committed Oct 25, 2011
1 parent 278fae6 commit 69ed6b8
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions lib/19/time.rb
Expand Up @@ -258,13 +258,13 @@ def make_time(year, mon, day, hour, min, sec, sec_fraction, zone, now)
#
def parse(date, now=self.now)
comp = !block_given?
d = Date._parse(date, comp)
if !d[:year] && !d[:mon] && !d[:mday] && !d[:hour] && !d[:min] && !d[:sec] && !d[:sec_fraction]
d = Date._parse(date, comp, true)
if !d.year && !d.mon && !d.mday && !d.hour && !d.min && !d.sec && !d.sec_fraction
raise ArgumentError, "no time information in #{date.inspect}"
end
year = d[:year]
year = d.year
year = yield(year) if year && !comp
make_time(year, d[:mon], d[:mday], d[:hour], d[:min], d[:sec], d[:sec_fraction], d[:zone], now)
make_time(year, d.mon, d.mday, d.hour, d.min, d.sec, d.sec_fraction, d.zone, now)
end

#
Expand Down

0 comments on commit 69ed6b8

Please sign in to comment.