Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-22 17:18:32 +01:00
Code Issues Projects Releases Wiki Activity

Date/Time: Rewrite and simplify get_gmt_from_date(), get_date_from_gmt(), and iso8601_to_datetime() using wp_timezone().

Browse Source 
Improve unit test coverage.

Props Rarst, goodevilgenius.
Fixes #31809.
Built from https://develop.svn.wordpress.org/trunk@45887


git-svn-id: http://core.svn.wordpress.org/trunk@45698 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2019-08-23 11:03:56 +00:00
parent 1aaf11947e
commit 9672302e04
2 changed files with 38 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
wp-includes/formatting.php
View File

@ -3384,71 +3384,45 @@ function _wp_iso_convert( $match ) {
/** /**
* Returns a date in the GMT equivalent. * Returns a date in the GMT equivalent.
* *
* Requires and returns a date in the Y-m-d H:i:s format. If there is a * Requires and returns a date in the Y-m-d H:i:s format.
* timezone_string available, the date is assumed to be in that timezone, * Return format can be overridden using the $format parameter.
* otherwise it simply subtracts the value of the 'gmt_offset' option. Return
* format can be overridden using the $format parameter.
* *
* @since 1.2.0 * @since 1.2.0
* *
* @param string $string The date to be converted. * @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) * @param string $format The format string for the returned date. Default 'Y-m-d H:i:s'.
* @return string GMT version of the date provided. * @return string GMT version of the date provided.
*/ */
function get_gmt_from_date( $string, $format = 'Y-m-d H:i:s' ) { function get_gmt_from_date( $string, $format = 'Y-m-d H:i:s' ) {
$tz = get_option( 'timezone_string' ); $datetime = date_create( $string, wp_timezone() );
if ( $tz ) {
$datetime = date_create( $string, new DateTimeZone( $tz ) ); if ( false === $datetime ) {
if ( ! $datetime ) { return gmdate( $format, 0 );
return gmdate( $format, 0 );
}
$datetime->setTimezone( new DateTimeZone( 'UTC' ) );
$string_gmt = $datetime->format( $format );
} else {
if ( ! 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 ) ) {
$datetime = strtotime( $string );
if ( false === $datetime ) {
return gmdate( $format, 0 );
}
return gmdate( $format, $datetime );
}
$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' ) * HOUR_IN_SECONDS );
} }
return $string_gmt;
return $datetime->setTimezone( new DateTimeZone( 'UTC' ) )->format( $format );
} }
/** /**
* Converts a GMT date into the correct format for the blog. * Converts a GMT date into the correct format for the blog.
* *
* Requires and returns a date in the Y-m-d H:i:s format. If there is a * Requires and returns a date in the Y-m-d H:i:s format.
* timezone_string available, the returned date is in that timezone, otherwise * Return format can be overridden using the $format parameter.
* it simply adds the value of gmt_offset. Return format can be overridden
* using the $format parameter
* *
* @since 1.2.0 * @since 1.2.0
* *
* @param string $string The date to be converted. * @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) * @param string $format The format string for the returned date. Default 'Y-m-d H:i:s'.
* @return string Formatted date relative to the timezone / GMT offset. * @return string Formatted date relative to the timezone.
*/ */
function get_date_from_gmt( $string, $format = 'Y-m-d H:i:s' ) { function get_date_from_gmt( $string, $format = 'Y-m-d H:i:s' ) {
$tz = get_option( 'timezone_string' ); $datetime = date_create( $string, new DateTimeZone( 'UTC' ) );
if ( $tz ) {
$datetime = date_create( $string, new DateTimeZone( 'UTC' ) ); if ( false === $datetime ) {
if ( ! $datetime ) { return gmdate( $format, 0 );
return gmdate( $format, 0 );
}
$datetime->setTimezone( new DateTimeZone( $tz ) );
$string_localtime = $datetime->format( $format );
} else {
if ( ! 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 ) ) {
return gmdate( $format, 0 );
}
$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' ) * HOUR_IN_SECONDS );
} }
return $string_localtime;
return $datetime->setTimezone( wp_timezone() )->format( $format );
} }
/** /**
@ -3473,35 +3447,32 @@ function iso8601_timezone_to_offset( $timezone ) {
} }
/** /**
* Converts an iso8601 date to MySQL DateTime format used by post_date[_gmt]. * Converts an iso8601 (Ymd\TH:i:sO) date to MySQL DateTime (Y-m-d H:i:s) format used by post_date[_gmt].
* *
* @since 1.5.0 * @since 1.5.0
* *
* @param string $date_string Date and time in ISO 8601 format {@link https://en.wikipedia.org/wiki/ISO_8601}. * @param string $date_string Date and time in ISO 8601 format {@link https://en.wikipedia.org/wiki/ISO_8601}.
* @param string $timezone Optional. If set to GMT returns the time minus gmt_offset. Default is 'user'. * @param string $timezone Optional. If set to 'gmt' returns the result in UTC. Default 'user'.
* @return string The date and time in MySQL DateTime format - Y-m-d H:i:s. * @return string|bool The date and time in MySQL DateTime format - Y-m-d H:i:s, or false on failure.
*/ */
function iso8601_to_datetime( $date_string, $timezone = 'user' ) { function iso8601_to_datetime( $date_string, $timezone = 'user' ) {
$timezone = strtolower( $timezone ); $timezone = strtolower( $timezone );
$wp_timezone = wp_timezone();
$datetime = date_create( $date_string, $wp_timezone ); // Timezone is ignored if input has one.
if ( $timezone == 'gmt' ) { if ( false === $datetime ) {
return false;
preg_match( '#([0-9]{4})([0-9]{2})([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})(Z|[\+|\-][0-9]{2,4}){0,1}#', $date_string, $date_bits );
if ( ! empty( $date_bits[7] ) ) { // we have a timezone, so let's compute an offset
$offset = iso8601_timezone_to_offset( $date_bits[7] );
} else { // we don't have a timezone, so we assume user local timezone (not server's!)
$offset = HOUR_IN_SECONDS * get_option( 'gmt_offset' );
}
$timestamp = gmmktime( $date_bits[4], $date_bits[5], $date_bits[6], $date_bits[2], $date_bits[3], $date_bits[1] );
$timestamp -= $offset;
return gmdate( 'Y-m-d H:i:s', $timestamp );
} elseif ( $timezone == 'user' ) {
return preg_replace( '#([0-9]{4})([0-9]{2})([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})(Z|[\+|\-][0-9]{2,4}){0,1}#', '$1-$2-$3 $4:$5:$6', $date_string );
} }
if ( 'gmt' === $timezone ) {
return $datetime->setTimezone( new DateTimeZone( 'UTC' ) )->format( 'Y-m-d H:i:s' );
}
if ( 'user' === $timezone ) {
return $datetime->setTimezone( $wp_timezone )->format( 'Y-m-d H:i:s' );
}
return false;
} }
/** /**

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.3-alpha-45886'; $wp_version = '5.3-alpha-45887';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.