Changeset 45886

Timestamp:

08/23/2019 02:14:07 AM (5 years ago)

Author:

SergeyBiryukov

Message:

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

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.

File:

• trunk/src/wp-admin/includes/class-wp-community-events.php (modified) (2 diffs)

trunk/src/wp-admin/includes/class-wp-community-events.php

@@ -403 +403 @@
     protected function trim_events( $response_body ) {
         if ( isset( $response_body['events'] ) ) {
-            $wordcamps         = array();
-            $current_timestamp = current_time( 'timestamp' );
+            $wordcamps = array();
+            $today     = current_time( 'Y-m-d' );
 
             foreach ( $response_body['events'] as $key => $event ) {
@@ -416 +416 @@
                 }
 
-                $event_timestamp = strtotime( $event['date'] );
-
-                if ( $current_timestamp > $event_timestamp && ( $current_timestamp - $event_timestamp ) > DAY_IN_SECONDS ) {
+                // 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 ( $today > $event_date ) {
                     unset( $response_body['events'][ $key ] );
                 }