Changeset 56949

Timestamp:

10/16/2023 11:49:10 PM (14 months ago)

Author:

peterwilsoncc

Message:

Options, Meta APIs: Prevent saving of invalid timezones.

Prevent the saving of invalid timezone string in to the database on the options pages. If an invalid timezone is submitted it is ignored and the setting remains unchanged.

This prevents a warning or fatal (depending on the PHP version) from being thrown by an invalid timezone setting on the Settings > General page.

Props ankit-k-gupta, costdev, huzaifaalmesbah, mrinal013, nicolefurlan, oglekler.
Fixes #58814.

Location:

trunk

Files:

• src/wp-admin/options.php (modified) (1 diff)
• tests/e2e/specs/general-settings-invalid-timezone.test.js (added)

trunk/src/wp-admin/options.php

@@ -280 +280 @@
             $_POST['gmt_offset']      = preg_replace( '/UTC\+?/', '', $_POST['gmt_offset'] );
             $_POST['timezone_string'] = '';
+        } elseif ( isset( $_POST['timezone_string'] ) && ! in_array( $_POST['timezone_string'], timezone_identifiers_list( DateTimeZone::ALL_WITH_BC ), true ) ) {
+            // Reset to the current value.
+            $current_timezone_string = get_option( 'timezone_string' );
+
+            if ( ! empty( $current_timezone_string ) ) {
+                $_POST['timezone_string'] = $current_timezone_string;
+            } else {
+                $_POST['gmt_offset']      = get_option( 'gmt_offset' );
+                $_POST['timezone_string'] = '';
+            }
+
+            add_settings_error(
+                'general',
+                'settings_updated',
+                __( 'The timezone you have entered is not valid. Please select a valid timezone.' ),
+                'error'
+            );
         }