diff options
| author | tadf <tadf@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-09-12 12:24:17 +0000 |
|---|---|---|
| committer | tadf <tadf@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-09-12 12:24:17 +0000 |
| commit | d50b19ff275aa3332c1b99f857e15f49ca4d39d3 (patch) | |
| tree | 9662874e99b27b3323527658dc91882eab9fdc97 | |
| parent | 5cc5e1c5beed714998d46209d439e3b9674178a8 (diff) | |
| download | ruby-d50b19ff275aa3332c1b99f857e15f49ca4d39d3.tar.gz | |
* lib/date.rb: [ruby-core:32096] Thanks Colin Bartlett.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29234 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | lib/date.rb | 4 |
2 files changed, 6 insertions, 2 deletions
@@ -1,3 +1,7 @@ +Sun Sep 12 21:21:50 2010 Tadayoshi Funaba <tadf@dotrb.org> + + * lib/date.rb: [ruby-core:32096] Thanks Colin Bartlett. + Sun Sep 12 19:30:27 2010 Tanaka Akira <akr@fsij.org> * ext/pathname/pathname.c (path_world_writable_p): diff --git a/lib/date.rb b/lib/date.rb index 8b1796201c..37c4b92d48 100644 --- a/lib/date.rb +++ b/lib/date.rb @@ -589,7 +589,7 @@ class Date # +sg+ specifies the Day of Calendar Reform. def _valid_ordinal? (y, d, sg=GREGORIAN) # :nodoc: if d < 0 - j = find_ldoy(y, sg) + return unless j = find_ldoy(y, sg) ny, nd = jd_to_ordinal(j + d + 1, sg) return unless ny == y d = nd @@ -616,7 +616,7 @@ class Date m += 13 end if d < 0 - j = find_ldom(y, m, sg) + return unless j = find_ldom(y, m, sg) ny, nm, nd = jd_to_civil(j + d + 1, sg) return unless [ny, nm] == [y, m] d = nd |