Context Navigation

← Previous Change
Next Change →

formatting.php

Timestamp:

11/30/2021 09:00:32 PM (5 years ago)

Author:

SergeyBiryukov

Message:

Options, Meta APIs: Improve error handling in sanitize_option().

To prevent potential false negatives, set $error to null initially, so we can better tell if it was ever changed during the sanitization and be able to better react if an empty string is added to it.

Additionally, and mainly for the sake of the Settings API at this point, add error messages to some WP_Error objects returned from wpdb methods that were previously causing the issues here.

Follow-up to [32791].

Props iCaleb, audrasjb, hellofromTonya, SergeyBiryukov.
Fixes #53986.

File:

: 1 edited

trunk/src/wp-includes/formatting.php (modified) (3 diffs)

Legend:

: Unmodified
: Added
: Removed

trunk/src/wp-includes/formatting.php

-              r52292
+              r52294
         $original_value = $value;
         $error          = '';
+        $error          = null;
         switch ( $option ) {
 …
+                        }
+                        if ( 'permalink_structure' === $option && '' !== $value && ! preg_match( '/%[^\/%]+%/', $value ) ) {
+                        if ( 'permalink_structure' === $option && null === $error
+                                && '' !== $value && ! preg_match( '/%[^\/%]+%/', $value )
+                        ) {
                                 $error = sprintf(
                                         /* translators: %s: Documentation URL. */
 …
+        }
+        if ( ! empty( $error ) ) {
+        if ( null !== $error ) {
+                if ( '' === $error && is_wp_error( $value ) ) {
+                        /* translators: 1: Option name, 2: Error code. */
+                        $error = sprintf( __( 'Could not sanitize the %1$s option. Error code: %2$s' ), $option, $value->get_error_code() );
+                }
                 $value = get_option( $option );
                 if ( function_exists( 'add_settings_error' ) ) {

Note: See TracChangeset for help on using the changeset viewer.

Make WordPress Core

Context Navigation

Changeset 52294 for trunk/src/wp-includes/formatting.php

Legend:

trunk/src/wp-includes/formatting.php

Download in other formats: