WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revisions: correct a timezone display issue. 

When preparing the data for the revisions screen, add ' +0000' to the gmt date string before passing it thru `strtotime`.

Props biranit, nacin, buley.
Fixes #25365.

Built from https://develop.svn.wordpress.org/trunk@41559


git-svn-id: http://core.svn.wordpress.org/trunk@41392 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Adam Silverstein 2017-09-21 23:33:44 +00:00
parent f0b5c39bde
commit 415e9379f9
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/includes/revision.php
View File

@ -166,7 +166,7 @@ function wp_prepare_revisions_for_js( $post, $selected_revision_id, $from = null
foreach ( $revisions as $revision ) { foreach ( $revisions as $revision ) {
$modified = strtotime( $revision->post_modified ); $modified = strtotime( $revision->post_modified );
$modified_gmt = strtotime( $revision->post_modified_gmt ); $modified_gmt = strtotime( $revision->post_modified_gmt . ' +0000' );
if ( $can_restore ) { if ( $can_restore ) {
$restore_link = str_replace( '&', '&', wp_nonce_url( $restore_link = str_replace( '&', '&', wp_nonce_url(
add_query_arg( add_query_arg(

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.9-alpha-41558'; $wp_version = '4.9-alpha-41559';
/** /**
* 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.