summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-07-17 09:32:04 +0000
committerknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-07-17 09:32:04 +0000
commitffd9245af6cae4c42247fd17afe3b203d7215106 (patch)
tree48f99a5be95de1229847bbc21648626cca08b291
parentd040bf759321c1cfc482c4bf2ff7d958371e82fe (diff)
Backport r24500; fixes #2556.
* lib/date.rb (complete_frags): Monday must be suitable for %W's default day. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@32574 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/date.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1adba71b2a..c7c8253a5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Jul 17 18:24:22 2011 Tadayoshi Funaba <tadf@dotrb.org>
+
+ * lib/date.rb (complete_frags): Monday must be suitable for %W's
+ default day.
+
Sun Jul 17 17:52:19 2011 Yukihiro Matsumoto <matz@ruby-lang.org>
* numeric.c (flo_cmp): Infinity is greater than any bignum
diff --git a/lib/date.rb b/lib/date.rb
index 55d0d0c118..8e0096e295 100644
--- a/lib/date.rb
+++ b/lib/date.rb
@@ -879,7 +879,7 @@ class Date
elem[e] = d.__send__(e)
end
elem[:wnum1] ||= 0
- elem[:wday] ||= 0
+ elem[:wday] ||= 1
end
end