Make WordPress Core

Changeset 52469 for branches/5.4


Ignore:
Timestamp:
01/06/2022 06:09:54 PM (2 years ago)
Author:
desrosj
Message:

Grouped backports to the 5.4 branch.

  • Query: Improve sanitization within WP_Tax_Query.
  • Query: Improve sanitization within WP_Meta_Query.
  • Upgrade/Install: Avoid using unserialize() unnecessarily.
  • Formatting: Correctly encode ASCII characters in post slugs.

Merges [52454-52457] to the 5.4 branch.
Props vortfu, dd32, ehtis, zieladam, whyisjake, xknown, peterwilsoncc, desrosj, iandunn.

Location:
branches/5.4
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • branches/5.4

  • branches/5.4/src/wp-admin/includes/upgrade.php

    r47280 r52469  
    16151615        while ( $rows = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options ORDER BY option_id LIMIT $start, 20" ) ) {
    16161616            foreach ( $rows as $row ) {
    1617                 $value = $row->option_value;
    1618                 if ( ! @unserialize( $value ) ) {
     1617                $value = maybe_unserialize( $row->option_value );
     1618                if ( $value === $row->option_value ) {
    16191619                    $value = stripslashes( $value );
    16201620                }
  • branches/5.4/src/wp-includes/class-wp-meta-query.php

    r47060 r52469  
    813813            $sibling_compare = strtoupper( $sibling['compare'] );
    814814            if ( in_array( $clause_compare, $compatible_compares ) && in_array( $sibling_compare, $compatible_compares ) ) {
    815                 $alias = $sibling['alias'];
     815                $alias = preg_replace( '/\W/', '_', $sibling['alias'] );
    816816                break;
    817817            }
  • branches/5.4/src/wp-includes/class-wp-tax-query.php

    r47122 r52469  
    528528            // The sibling must both have compatible operator to share its alias.
    529529            if ( in_array( strtoupper( $sibling['operator'] ), $compatible_operators ) ) {
    530                 $alias = $sibling['alias'];
     530                $alias = preg_replace( '/\W/', '_', $sibling['alias'] );
    531531                break;
    532532            }
     
    557557        }
    558558
    559         $query['terms'] = array_unique( (array) $query['terms'] );
     559        if ( 'slug' === $query['field'] || 'name' === $query['field'] ) {
     560            $query['terms'] = array_unique( (array) $query['terms'] );
     561        } else {
     562            $query['terms'] = wp_parse_id_list( $query['terms'] );
     563        }
    560564
    561565        if ( is_taxonomy_hierarchical( $query['taxonomy'] ) && $query['include_children'] ) {
  • branches/5.4/src/wp-includes/formatting.php

    r47643 r52469  
    11581158 *
    11591159 * @since 1.5.0
    1160  *
    1161  * @param string $utf8_string
    1162  * @param int    $length Max  length of the string
     1160 * @since 5.8.3 Added the `encode_ascii_characters` parameter.
     1161 *
     1162 * @param string $utf8_string             String to encode.
     1163 * @param int    $length                  Max length of the string
     1164 * @param bool   $encode_ascii_characters Whether to encode ascii characters such as < " '
    11631165 * @return string String with Unicode encoded for URI.
    11641166 */
    1165 function utf8_uri_encode( $utf8_string, $length = 0 ) {
     1167function utf8_uri_encode( $utf8_string, $length = 0, $encode_ascii_characters = false ) {
    11661168    $unicode        = '';
    11671169    $values         = array();
     
    11781180
    11791181        if ( $value < 128 ) {
    1180             if ( $length && ( $unicode_length >= $length ) ) {
     1182            $char                = chr( $value );
     1183            $encoded_char        = $encode_ascii_characters ? rawurlencode( $char ) : $char;
     1184            $encoded_char_length = strlen( $encoded_char );
     1185            if ( $length && ( $unicode_length + $encoded_char_length ) > $length ) {
    11811186                break;
    11821187            }
    1183             $unicode .= chr( $value );
    1184             $unicode_length++;
     1188            $unicode        .= $encoded_char;
     1189            $unicode_length += $encoded_char_length;
    11851190        } else {
    11861191            if ( count( $values ) == 0 ) {
  • branches/5.4/src/wp-includes/post.php

    r47639 r52469  
    45104510            $slug = substr( $slug, 0, $length );
    45114511        } else {
    4512             $slug = utf8_uri_encode( $decoded_slug, $length );
     4512            $slug = utf8_uri_encode( $decoded_slug, $length, true );
    45134513        }
    45144514    }
Note: See TracChangeset for help on using the changeset viewer.