Ticket #37465: wp_timezone_choice.2.patch

src/wp-includes/functions.php

@@ -4533 +4548 @@
         $structure[] = '<option ' . $selected . 'value="' . esc_attr( 'UTC' ) . '">' . __('UTC') . '</option>';
         $structure[] = '</optgroup>';
 
-        // Do manual UTC offsets
-        $structure[] = '<optgroup label="'. esc_attr__( 'Manual Offsets' ) .'">';
-        $offset_range = array (-12, -11.5, -11, -10.5, -10, -9.5, -9, -8.5, -8, -7.5, -7, -6.5, -6, -5.5, -5, -4.5, -4, -3.5, -3, -2.5, -2, -1.5, -1, -0.5,
-                0, 0.5, 1, 1.5, 2, 2.5, 3, 3.5, 4, 4.5, 5, 5.5, 5.75, 6, 6.5, 7, 7.5, 8, 8.5, 8.75, 9, 9.5, 10, 10.5, 11, 11.5, 12, 12.75, 13, 13.75, 14);
-        foreach ( $offset_range as $offset ) {
-                if ( 0 <= $offset )
-                        $offset_name = '+' . $offset;
-                else
-                        $offset_name = (string) $offset;
+        /**
+         * Filters if the UTC option are shown in the timezone dropdown.
+         *
+         * @since 4.6
+         *
+         * @param Bool true to show.
+         */
+        if( true === apply_filters( 'show_utc_offsets', empty( get_option('timezone_string') ) ) ) {
+                // Do manual UTC offsets
+                $structure[] = '<optgroup label="'. esc_attr__( 'Manual Offsets' ) .'">';
+                $offset_range = array (-12, -11.5, -11, -10.5, -10, -9.5, -9, -8.5, -8, -7.5, -7, -6.5, -6, -5.5, -5, -4.5, -4, -3.5, -3, -2.5, -2, -1.5, -1, -0.5,
+                        0, 0.5, 1, 1.5, 2, 2.5, 3, 3.5, 4, 4.5, 5, 5.5, 5.75, 6, 6.5, 7, 7.5, 8, 8.5, 8.75, 9, 9.5, 10, 10.5, 11, 11.5, 12, 12.75, 13, 13.75, 14);
+                foreach ( $offset_range as $offset ) {
+                        if ( 0 <= $offset )
+                                $offset_name = '+' . $offset;
+                        else
+                                $offset_name = (string) $offset;
 
-                $offset_value = $offset_name;
-                $offset_name = str_replace(array('.25','.5','.75'), array(':15',':30',':45'), $offset_name);
-                $offset_name = 'UTC' . $offset_name;
-                $offset_value = 'UTC' . $offset_value;
-                $selected = '';
-                if ( $offset_value === $selected_zone )
-                        $selected = 'selected="selected" ';
-                $structure[] = '<option ' . $selected . 'value="' . esc_attr( $offset_value ) . '">' . esc_html( $offset_name ) . "</option>";
+                        $offset_value = $offset_name;
+                        $offset_name = str_replace(array('.25','.5','.75'), array(':15',':30',':45'), $offset_name);
+                        $offset_name = 'UTC' . $offset_name;
+                        $offset_value = 'UTC' . $offset_value;
+                        $selected = '';
+                        if ( $offset_value === $selected_zone )
+                                $selected = 'selected="selected" ';
 
+                        $structure[] = '<option ' . $selected . 'value="' . esc_attr( $offset_value ) . '">' . esc_html( $offset_name ) . "</option>";
+                }
+                $structure[] = '</optgroup>';
         }
-        $structure[] = '</optgroup>';
 
         return join( "\n", $structure );
 }

tests/phpunit/tests/functions/wp-timezone-choice.php

@@ +1 @@
+<?php
+/**
+ * Tests for size_format()
+ *
+ * @group functions.php
+ * @ticket 36635
+ */
+
+if ( ! defined( 'WPINC' ) ) {
+        die;
+}
+
+class Test_Functions_WP_Timezone_Choice extends WP_UnitTestCase {
+
+        public function _data_Timezone() {
+                return array(
+                        array( 'UTC+3', '/.*UTC\+3.*/s' ),
+                        array( 'UTC-8', '/.*UTC-8.*/s' ),
+                        array( 'UTC', '/.*UTC.*/s' ),
+                        array( 'Pacific/Fakaofo', '/.*Pacific\/Fakaofo.*/s' ),
+                        array( 'America/Toronto"', '/.*America\/Toronto.*/s' ),
+                );
+        }
+
+        /**
+         * @dataProvider _data_Timezone
+         *
+         * @param $time_zone_string
+         * @param $expected_in_return
+         */
+        public function test_wp_timezone_choice( $time_zone_string, $expected_in_return ) {
+
+                $this->assertRegExp( $expected_in_return, wp_timezone_choice( $time_zone_string ) );
+        }
+}
+ No newline at end of file