enmi-conf.org: comparison wp/wp-admin/includes/class-wp-community-events.php

equal deleted inserted replaced

-:3d4e9c994f10
+:a86126ab1dd4
 		if ( ! $location_search && $cached_events ) {
 			return $cached_events;
 		}
-		// include an unmodified $wp_version
+		// Include an unmodified $wp_version.
-		include( ABSPATH . WPINC . '/version.php' );
+		require ABSPATH . WPINC . '/version.php';
 		$api_url                    = 'http://api.wordpress.org/events/1.0/';
 		$request_args               = $this->get_request_args( $location_search, $timezone );
 		$request_args['user-agent'] = 'WordPress/' . $wp_version . '; ' . home_url( '/' );
 		if ( is_wp_error( $response ) ) {
 			$response_error = $response;
 		} elseif ( 200 !== $response_code ) {
 			$response_error = new WP_Error(
 				'api-error',
-				/* translators: %d: numeric HTTP status code, e.g. 400, 403, 500, 504, etc. */
+				/* translators: %d: Numeric HTTP status code, e.g. 400, 403, 500, 504, etc. */
-				sprintf( __( 'Invalid API response code (%d)' ), $response_code )
+				sprintf( __( 'Invalid API response code (%d).' ), $response_code )
 			);
 		} elseif ( ! isset( $response_body['location'], $response_body['events'] ) ) {
 			$response_error = new WP_Error(
 				'api-invalid-response',
 				isset( $response_body['error'] ) ? $response_body['error'] : __( 'Unknown API error.' )
 	 * _NOT_ guarantee that the returned address is valid or accurate, and it can
 	 * be easily spoofed.
 	 *
 	 * @since 4.8.0
 	 *
-	 * @return false|string The anonymized address on success; the given address
+	 * @return string|false The anonymized address on success; the given address
 	 *                      or false on failure.
 	 */
 	public static function get_unsafe_client_ip() {
 		$client_ip = false;
 	 * functions, and having it abstracted keeps the logic consistent and DRY,
 	 * which is less prone to errors.
 	 *
 	 * @since 4.8.0
 	 *
-	 * @param  array $location Should contain 'latitude' and 'longitude' indexes.
+	 * @param array $location Should contain 'latitude' and 'longitude' indexes.
 	 * @return bool|string false on failure, or a string on success.
 	 */
 	protected function get_events_transient_key( $location ) {
 		$key = false;
 	/**
 	 * Gets cached events.
 	 *
 	 * @since 4.8.0
 	 *
-	 * @return false|array false on failure; an array containing `location`
+	 * @return array|false An array containing `location` and `events` items
-	 *                     and `events` items on success.
+	 *                     on success, false on failure.
 	 */
 	public function get_cached_events() {
 		$cached_response = get_site_transient( $this->get_events_transient_key( $this->user_location ) );
 		$cached_response = $this->trim_events( $cached_response );
 	 * the cache, then all users would see the events in the localized data/time
 	 * of the user who triggered the cache refresh, rather than their own.
 	 *
 	 * @since 4.8.0
 	 *
-	 * @param  array $response_body The response which contains the events.
+	 * @param array $response_body The response which contains the events.
 	 * @return array The response with dates and times formatted.
 	 */
 	protected function format_event_data_time( $response_body ) {
 		if ( isset( $response_body['events'] ) ) {
 			foreach ( $response_body['events'] as $key => $event ) {
 				 * The `date_format` option is not used because it's important
 				 * in this context to keep the day of the week in the formatted date,
 				 * so that users can tell at a glance if the event is on a day they
 				 * are available, without having to open the link.
 				 */
-				/* translators: Date format for upcoming events on the dashboard. Include the day of the week. See https://secure.php.net/date. */
+				/* translators: Date format for upcoming events on the dashboard. Include the day of the week. See https://www.php.net/date */
-				$response_body['events'][ $key ]['formatted_date'] = date_i18n( __( 'l, M j, Y' ), $timestamp );
+				$formatted_date = date_i18n( __( 'l, M j, Y' ), $timestamp );
-				$response_body['events'][ $key ]['formatted_time'] = date_i18n( get_option( 'time_format' ), $timestamp );
+				$formatted_time = date_i18n( get_option( 'time_format' ), $timestamp );
+				if ( isset( $event['end_date'] ) ) {
+					$end_timestamp      = strtotime( $event['end_date'] );
+					$formatted_end_date = date_i18n( __( 'l, M j, Y' ), $end_timestamp );
+					if ( 'meetup' !== $event['type'] && $formatted_end_date !== $formatted_date ) {
+						/* translators: Upcoming events month format. See https://www.php.net/date */
+						$start_month = date_i18n( _x( 'F', 'upcoming events month format' ), $timestamp );
+						$end_month   = date_i18n( _x( 'F', 'upcoming events month format' ), $end_timestamp );
+						if ( $start_month === $end_month ) {
+							$formatted_date = sprintf(
+								/* translators: Date string for upcoming events. 1: Month, 2: Starting day, 3: Ending day, 4: Year. */
+								__( '%1$s %2$d–%3$d, %4$d' ),
+								$start_month,
+								/* translators: Upcoming events day format. See https://www.php.net/date */
+								date_i18n( _x( 'j', 'upcoming events day format' ), $timestamp ),
+								date_i18n( _x( 'j', 'upcoming events day format' ), $end_timestamp ),
+								/* translators: Upcoming events year format. See https://www.php.net/date */
+								date_i18n( _x( 'Y', 'upcoming events year format' ), $timestamp )
+							);
+						} else {
+							$formatted_date = sprintf(
+								/* translators: Date string for upcoming events. 1: Starting month, 2: Starting day, 3: Ending month, 4: Ending day, 5: Year. */
+								__( '%1$s %2$d – %3$s %4$d, %5$d' ),
+								$start_month,
+								date_i18n( _x( 'j', 'upcoming events day format' ), $timestamp ),
+								$end_month,
+								date_i18n( _x( 'j', 'upcoming events day format' ), $end_timestamp ),
+								date_i18n( _x( 'Y', 'upcoming events year format' ), $timestamp )
+							);
+						}
+						$formatted_date = wp_maybe_decline_date( $formatted_date, 'F j, Y' );
+					}
+				}
+				$response_body['events'][ $key ]['formatted_date'] = $formatted_date;
+				$response_body['events'][ $key ]['formatted_time'] = $formatted_time;
 			}
 		}
 		return $response_body;
 	}
 	 * higher position, so that it doesn't get trimmed off.
 	 *
 	 * @since 4.8.0
 	 * @since 4.9.7 Stick a WordCamp to the final list.
 	 *
-	 * @param  array $response_body The response body which contains the events.
+	 * @param array $response_body The response body which contains the events.
 	 * @return array The response body with events trimmed.
 	 */
 	protected function trim_events( $response_body ) {
 		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 ) {
 				/*
 				 * Skip WordCamps, because they might be multi-day events.
 				 * Save a copy so they can be pinned later.
 				if ( 'wordcamp' === $event['type'] ) {
 					$wordcamps[] = $event;
 					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 ] );
 				}
 			}
 			$response_body['events'] = array_slice( $response_body['events'], 0, 3 );
 			$trimmed_event_types     = wp_list_pluck( $response_body['events'], 'type' );
 			// Make sure the soonest upcoming WordCamp is pinned in the list.
-			if ( ! in_array( 'wordcamp', $trimmed_event_types ) && $wordcamps ) {
+			if ( ! in_array( 'wordcamp', $trimmed_event_types, true ) && $wordcamps ) {
 				array_pop( $response_body['events'] );
 				array_push( $response_body['events'], $wordcamps[0] );
 			}
 		}

changeset 16	a86126ab1dd4
parent 9	177826044cd9
child 18	be944660c56a