From 7a39fcc19527cf6ac63d7c760c292fab96053244 Mon Sep 17 00:00:00 2001 From: akr Date: Sat, 3 May 2014 18:27:21 +0000 Subject: [PATCH] * lib/time.rb (Time.make_time): Refactored. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45801 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ lib/time.rb | 6 +----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index a9e56d8424..f0d783b0c9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sun May 4 03:26:39 2014 Tanaka Akira + + * lib/time.rb (Time.make_time): Refactored. + Sun May 4 02:53:17 2014 Tanaka Akira * lib/time.rb (Time.rfc2822): Fix year completion. diff --git a/lib/time.rb b/lib/time.rb index cb37c4e562..9d4e9cccba 100644 --- a/lib/time.rb +++ b/lib/time.rb @@ -258,11 +258,7 @@ class Time year, mon, day, hour, min, sec = apply_offset(year, mon, day, hour, min, sec, off) t = self.utc(year, mon, day, hour, min, sec, usec) - if zone_utc?(zone) - t.utc - else - t.localtime(off) - end + t.localtime(off) if !zone_utc?(zone) t else self.local(year, mon, day, hour, min, sec, usec)