Changeset 47073 for trunk

Timestamp:

01/16/2020 12:26:08 AM (5 years ago)

Author:

SergeyBiryukov

Message:

Date/Time: Use wp_date() to display the correct time of the next DST transition in Timezone setting on General Settings screen.

Props Rarst, autotutorial.
Fixes #49038.

File:

• trunk/src/wp-admin/options-general.php (modified) (1 diff)

trunk/src/wp-admin/options-general.php

@@ -277 +277 @@
     <br />
     <?php
-    $allowed_zones = timezone_identifiers_list();
-
-    if ( in_array( $tzstring, $allowed_zones ) ) {
-        $found                   = false;
-        $date_time_zone_selected = new DateTimeZone( $tzstring );
-        $tz_offset               = timezone_offset_get( $date_time_zone_selected, date_create() );
-        $right_now               = time();
-        foreach ( timezone_transitions_get( $date_time_zone_selected ) as $tr ) {
-            if ( $tr['ts'] > $right_now ) {
-                $found = true;
-                break;
-            }
-        }
-
-        if ( $found ) {
+    if ( in_array( $tzstring, timezone_identifiers_list() ) ) {
+        $transitions = timezone_transitions_get( timezone_open( $tzstring ), time() );
+
+        // 0 index is the state at current time, 1 index is the next transition, if any.
+        if ( ! empty( $transitions[1] ) ) {
             echo ' ';
-            $message = $tr['isdst'] ?
+            $message = $transitions[1]['isdst'] ?
                 /* translators: %s: Date and time. */
                 __( 'Daylight saving time begins on: %s.' ) :
                 /* translators: %s: Date and time. */
                 __( 'Standard time begins on: %s.' );
-            // Add the difference between the current offset and the new offset to ts to get the correct transition time from date_i18n().
             printf(
                 $message,
-                '<code>' . date_i18n(
-                    __( 'F j, Y' ) . ' ' . __( 'g:i a' ),
-                    $tr['ts'] + ( $tz_offset - $tr['offset'] )
-                ) . '</code>'
+                '<code>' . wp_date( __( 'F j, Y' ) . ' ' . __( 'g:i a' ), $transitions[1]['ts'] ) . '</code>'
             );
         } else {