From da6229a3a0a538aabcd0c209b1f751d0582d8ba3 Mon Sep 17 00:00:00 2001
From: akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 7 Oct 2013 11:10:03 +0000
Subject: * lib/time.rb (Time.strptime): Use :offset.   Patch by Felipe
 Contreras.  [ruby-core:57694]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43177 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/time.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'lib/time.rb')

diff --git a/lib/time.rb b/lib/time.rb
index 91b5b54fe9..4474f275be 100644
--- a/lib/time.rb
+++ b/lib/time.rb
@@ -393,7 +393,8 @@ class Time
       d = Date._strptime(date, format)
       raise ArgumentError, "invalid strptime format - `#{format}'" unless d
       if seconds = d[:seconds]
-        Time.at(seconds)
+        offset = d[:offset] || 0
+        Time.at(seconds).localtime(offset)
       else
         year = d[:year]
         year = yield(year) if year && block_given?
-- 
cgit v1.2.3