summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-07-13 14:47:56 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-07-13 14:47:56 +0000
commitad22d67e2b3f35c540c6794cb343024bca694544 (patch)
tree884e52efe341d8c44fea6385d64f971db410405e /ext
parent34b1d25015b98a5d000a61dac9d495c8c834c1a2 (diff)
merge revision(s) 41871: [Backport #8608]
* ext/date/date_parse.c (date_zone_to_diff): [ruby-core:55831]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41951 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r--ext/date/date_parse.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/date/date_parse.c b/ext/date/date_parse.c
index 815c07f483..765f9a7292 100644
--- a/ext/date/date_parse.c
+++ b/ext/date/date_parse.c
@@ -569,7 +569,7 @@ date_zone_to_diff(VALUE str)
if (cl >= 3)
min = rb_str_new(&cs[1], 2);
if (cl >= 5)
- min = rb_str_new(&cs[3], 2);
+ sec = rb_str_new(&cs[3], 2);
}
else {
if (cl >= 2)