WordPress.org

Make WordPress Core

Changeset 17920


Ignore:
Timestamp:
05/13/2011 07:17:07 PM (9 years ago)
Author:
ryan
Message:

Remove PHP5 back compat code from get_gmt_from_date. Props technosailor. fixes #16920

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-includes/formatting.php

    r17636 r17920  
    15891589 * Requires and returns a date in the Y-m-d H:i:s format. Simply subtracts the
    15901590 * value of the 'gmt_offset' option. Return format can be overridden using the
    1591  * $format parameter. If PHP5 is supported, the function uses the DateTime and
    1592  * DateTimeZone objects to respect time zone differences in DST.
     1591 * $format parameter.
    15931592 *
    15941593 * @since 1.2.0
     
    16021601    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);
    16031602    $tz = get_option('timezone_string');
    1604     if( class_exists('DateTime') && $tz ) {
    1605         //PHP5
    1606         date_default_timezone_set( $tz );
    1607         $datetime = new DateTime( $string );
    1608         $datetime->setTimezone( new DateTimeZone('UTC') );
    1609         $offset = $datetime->getOffset();
    1610         $datetime->modify( '+' . $offset / 3600 . ' hours');
    1611         $string_gmt = gmdate($format, $datetime->format('U'));
    1612 
    1613         date_default_timezone_set('UTC');
    1614     }
    1615     else {
    1616         //PHP4
    1617         $string_time = gmmktime($matches[4], $matches[5], $matches[6], $matches[2], $matches[3], $matches[1]);
    1618         $string_gmt = gmdate($format, $string_time - get_option('gmt_offset') * 3600);
    1619     }
     1603    date_default_timezone_set( $tz );
     1604    $datetime = new DateTime( $string );
     1605    $datetime->setTimezone( new DateTimeZone('UTC') );
     1606    $offset = $datetime->getOffset();
     1607    $datetime->modify( '+' . $offset / 3600 . ' hours');
     1608    $string_gmt = gmdate($format, $datetime->format('U'));
     1609    date_default_timezone_set('UTC');
    16201610    return $string_gmt;
    16211611}
Note: See TracChangeset for help on using the changeset viewer.