Changeset 56132

Timestamp:

07/04/2023 01:40:55 PM (10 months ago)

Author:

SergeyBiryukov

Message:

Options, Meta APIs: Check if the gmt_offset value is numeric in sanitize_option().

When saving the settings via the admin UI, the default value for any options not passed in the current $_POST request is set to null in wp-admin/options.php. Some options, e.g. blog_public, then rely on null being passed to update_option() to determine whether the value was changed or not.

This commit resolves a PHP 8.1 deprecation notice when saving the gmt_offset option without any changes:

Deprecated: preg_replace(): Passing null to parameter #3 ($subject) of type array|string is deprecated

Includes a similar fix for the blog_charset option.

Follow-up to [4112], [4329], [5541], [21849].

Props adi3890, dhrupo, hrdelwar, hasanmisbah, oglekler, mukesh27, SergeyBiryukov.
Fixes #57728.

Location:

trunk

Files:

• src/wp-includes/formatting.php (modified) (2 diffs)
• tests/phpunit/tests/option/sanitizeOption.php (modified) (2 diffs)

trunk/src/wp-includes/formatting.php

@@ -4884 +4884 @@
 
         case 'blog_charset':
-            $value = preg_replace( '/[^a-zA-Z0-9_-]/', '', $value ); // Strips slashes.
+            if ( is_string( $value ) ) {
+                $value = preg_replace( '/[^a-zA-Z0-9_-]/', '', $value ); // Strips slashes.
+            } else {
+                $value = '';
+            }
             break;
 
@@ -4919 +4923 @@
 
         case 'gmt_offset':
-            $value = preg_replace( '/[^0-9:.-]/', '', $value ); // Strips slashes.
+            if ( is_numeric( $value ) ) {
+                $value = preg_replace( '/[^0-9:.-]/', '', $value ); // Strips slashes.
+            } else {
+                $value = '';
+            }
             break;
 

trunk/tests/phpunit/tests/option/sanitizeOption.php

@@ -37 +37 @@
             array( 'blog_charset', 'UTF-8', 'UTF-8' ),
             array( 'blog_charset', 'charset', '">charset<"' ),
+            array( 'blog_charset', '', null ),
             array( 'blog_public', 1, null ),
             array( 'blog_public', 1, '1' ),
@@ -46 +47 @@
             array( 'gmt_offset', '0', 0 ),
             array( 'gmt_offset', '1.5', '1.5' ),
+            array( 'gmt_offset', '', null ),
             array( 'siteurl', 'http://example.org', 'http://example.org' ),
             array( 'siteurl', 'http://example.org/subdir', 'http://example.org/subdir' ),