Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-09-24 21:32:51 +02:00
Code Issues Projects Releases Wiki Activity

Date/Time: Simplify the date comparing logic in WP_Community_Events::trim_events().

Browse Source 
The Events API returns event date without timezone information, so trying to parse it into a timestamp and compare to a WP timestamp is pointless.

Props Rarst.
Fixes #47463.
Built from https://develop.svn.wordpress.org/trunk@45886


git-svn-id: http://core.svn.wordpress.org/trunk@45697 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2019-08-23 02:15:55 +00:00
parent 601f5f7376
commit 1aaf11947e
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wp-admin/includes/class-wp-community-events.php
View File

@ -402,8 +402,8 @@ class WP_Community_Events {
*/ */
protected function trim_events( $response_body ) { protected function trim_events( $response_body ) {
if ( isset( $response_body['events'] ) ) { if ( isset( $response_body['events'] ) ) {
$wordcamps = array(); $wordcamps = array();
$current_timestamp = current_time( 'timestamp' ); $today = current_time( 'Y-m-d' );
foreach ( $response_body['events'] as $key => $event ) { foreach ( $response_body['events'] as $key => $event ) {
/* /*
@ -415,9 +415,10 @@ class WP_Community_Events {
continue; continue;
} }
$event_timestamp = strtotime( $event['date'] ); // We don't get accurate time with timezone from API, so we only take the date part (Y-m-d).
$event_date = substr( $event['date'], 0, 10 );
if ( $current_timestamp > $event_timestamp && ( $current_timestamp - $event_timestamp ) > DAY_IN_SECONDS ) { if ( $today > $event_date ) {
unset( $response_body['events'][ $key ] ); unset( $response_body['events'][ $key ] );
} }
} }

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.3-alpha-45885'; $wp_version = '5.3-alpha-45886';
/** /**
* 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.