Merge remote-tracking branch 'fridgesm/bug274'

joindin · Mar 19, 2013 · 4256d22 · 4256d22
2 parents 71ead58 + 55ae6ef
commit 4256d22
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 24 deletions.
diff --git a/src/api-v2/inc/Timezone.php b/src/api-v2/inc/Timezone.php
@@ -47,16 +47,7 @@ public static function getDatetimeFromUnixtime($unixtime, $timezone)
         }
         $datetime->setTimezone($tz);
 
-        // How much wrong will ->format("U") be if I do it now, due to DST changes?
-        // Only needed until PHP Bug #51051 delivers a better method
-        $unix_offset1    = $tz->getOffset($datetime);
-        $unix_offset2    = $tz->getOffset(new DateTime());
-        $unix_correction = $unix_offset1 - $unix_offset2;
-
-        // create datetime object corrected for DST offset
-        $timestamp = $unixtime + $unix_correction;
-
-        $datetime = new DateTime("@{$timestamp}");
+        $datetime = new DateTime("@{$unixtime}");
         $datetime->setTimezone($tz);
         return $datetime;
     }
@@ -127,13 +118,7 @@ public static function UnixtimeForTimeInTimezone(
         $dateObj->setDate($year, $month, $day);
         $dateObj->setTime($hour, $minute, $second);
 
-        // How much wrong will ->format("U") be if I do it now, due to DST changes?
-        // Only needed until PHP Bug #51051 delivers a better method
-        $unix_offset1    = $tz->getOffset($dateObj);
-        $unix_offset2    = $tz->getOffset(new DateTime());
-        $unix_correction = $unix_offset1 - $unix_offset2;
-
-        $unixTimestamp = $dateObj->format("U") - $unix_correction;
+        $unixTimestamp = $dateObj->format("U");
 
         return $unixTimestamp;
     }

diff --git a/src/system/application/controllers/talk.php b/src/system/application/controllers/talk.php
@@ -274,13 +274,7 @@ function add($id = null, $opt = null)
                 $this->input->post('given_min'), $talk_timezone
             );
 
-            // how much wrong will ->format("U") be if I do it now,
-            // due to DST changes?
-            // only needed until PHP Bug #51051 delivers a better method
-            $unix_offset1    = $talk_timezone->getOffset($talk_datetime);
-            $unix_offset2    = $talk_timezone->getOffset(new DateTime());
-            $unix_correction = $unix_offset1 - $unix_offset2;
-            $unix_timestamp  = $talk_datetime->format("U") - $unix_correction;
+            $unix_timestamp  = $talk_datetime->format("U");
 
             $arr = array(
                 'talk_title'  => $this->input->post('talk_title'),