summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--lib/date/format.rb10
2 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 027f0c2a6b..13e29321e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Nov 6 11:31:04 2004 Tadayoshi Funaba <tadf@dotrb.org>
+
+ * lib/date.rb (_parse): checks whether zone was given.
+
Sat Nov 6 00:46:27 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* string.c (rb_str_locktmp): check STR_TMPLOCK flag before
diff --git a/lib/date/format.rb b/lib/date/format.rb
index e8e54e7894..d821ecb04e 100644
--- a/lib/date/format.rb
+++ b/lib/date/format.rb
@@ -1,5 +1,5 @@
# format.rb: Written by Tadayoshi Funaba 1999-2004
-# $Id: format.rb,v 2.13 2004-03-20 08:05:13+09 tadf Exp $
+# $Id: format.rb,v 2.14 2004-11-06 10:58:40+09 tadf Exp $
require 'rational'
@@ -276,7 +276,9 @@ class Date
end
end
- zone = $6
+ if $6
+ zone = $6
+ end
end
# eu
@@ -423,7 +425,9 @@ class Date
if $4
sec_fraction = $4.to_i.to_r / (10**$4.size)
end
- zone = $5
+ if $5
+ zone = $5
+ end
end
if str.sub!(/\b(bc\b|bce\b|b\.c\.|b\.c\.e\.)/ino, ' ')