Ticket #9285: 9285-4.2.patch

formatting.php

@@ -1562 +1562 @@
  * @uses get_option() to retrieve the the value of 'gmt_offset'.
  * @param string $string The date to be converted.
  * @param string $format The format string for the returned date (default is Y-m-d H:i:s)
- * @return string GMT version of the date provided.
+ * @return string GMT version of the date provided. If PHP5 is supported, the function uses the DateTime and 
+ * DateTimeZone objects to respect time zone differences in DST.
  */
 function get_gmt_from_date($string, $format = 'Y-m-d H:i:s') {
-        preg_match('#([0-9]{1,4})-([0-9]{1,2})-([0-9]{1,2}) ([0-9]{1,2}):([0-9]{1,2}):([0-9]{1,2})#', $string, $matches);
-        $string_time = gmmktime($matches[4], $matches[5], $matches[6], $matches[2], $matches[3], $matches[1]);
-        $string_gmt = gmdate($format, $string_time - get_option('gmt_offset') * 3600);
-        return $string_gmt;
+        if( wp_timezone_supported() && $tz_string = get_option( 'timezone_string' ) ) {
+                // PHP 5
+                $tz_object = timezone_open( $tz_string );
+                $datetime = date_create( $string, $tz_object );
+                $timestamp = $datetime->getTimestamp();
+        }
+        else {
+                // PHP 4
+                preg_match('#([0-9]{1,4})-([0-9]{1,2})-([0-9]{1,2}) ([0-9]{1,2}):([0-9]{1,2}):([0-9]{1,2})#', $string, $matches);
+                $timestamp = gmmktime( $matches[4], $matches[5], $matches[6], $matches[2], $matches[3], $matches[1] ) - get_option('gmt_offset') * 3600;
+        }
+        return gmdate( $format, $timestamp );
 }
 
 /**
@@ -1584 +1593 @@
  * @return string Formatted date relative to the GMT offset.
  */
 function get_date_from_gmt($string, $format = 'Y-m-d H:i:s') {
-        preg_match('#([0-9]{1,4})-([0-9]{1,2})-([0-9]{1,2}) ([0-9]{1,2}):([0-9]{1,2}):([0-9]{1,2})#', $string, $matches);
-        $string_time = gmmktime($matches[4], $matches[5], $matches[6], $matches[2], $matches[3], $matches[1]);
-        $string_localtime = gmdate($format, $string_time + get_option('gmt_offset')*3600);
-        return $string_localtime;
+        if( wp_timezone_supported() ) {
+                // PHP 5
+                $timezone_object = timezone_open( 'GMT' );
+                $datetime = date_create( $string, $timezone_object );
+                $timestamp = $datetime->getTimestamp();
+        }
+        else {
+                // PHP 4
+                preg_match('#([0-9]{1,4})-([0-9]{1,2})-([0-9]{1,2}) ([0-9]{1,2}):([0-9]{1,2}):([0-9]{1,2})#', $string, $matches);
+                $timestamp = gmmktime($matches[4], $matches[5], $matches[6], $matches[2], $matches[3], $matches[1]) + get_option('gmt_offset') * 3600;
+        }
+        return gmdate($format, $timestamp);
 }
 
 /**

post.php

@@ -4112 +4112 @@
  */
 function _future_post_hook( $deprecated = '', $post ) {
         wp_clear_scheduled_hook( 'publish_future_post', array( $post->ID ) );
-        wp_schedule_single_event( strtotime( $post->post_date_gmt. ' GMT' ), 'publish_future_post', array( $post->ID ) );
+        wp_schedule_single_event( get_gmt_from_date( $post->post_date, 'U' ), 'publish_future_post', array( $post->ID ) );
 }
 
 /**