From a8178c69bee18250aa022bb270390279487a8618 Mon Sep 17 00:00:00 2001
From: akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 7 Oct 2013 21:00:12 +0000
Subject: * lib/time.rb (Time.strptime): Time.strptime('0', '%s') returns local
   time Time object as Ruby 2.0 and before.

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

(limited to 'lib/time.rb')

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