Make WordPress Core

Changeset 52473


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

Grouped backports to the 5.0 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.0 branch.
Props vortfu, dd32, ehtis, zieladam, whyisjake, xknown, peterwilsoncc, desrosj, iandunn.

Location:
branches/5.0
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • branches/5.0

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

    r43954 r52473  
    13261326        while( $rows = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options ORDER BY option_id LIMIT $start, 20" ) ) {
    13271327            foreach ( $rows as $row ) {
    1328                 $value = $row->option_value;
    1329                 if ( !@unserialize( $value ) )
     1328                $value = maybe_unserialize( $row->option_value );
     1329                if ( $value === $row->option_value )
    13301330                    $value = stripslashes( $value );
    13311331                if ( $value !== $row->option_value ) {
  • branches/5.0/src/wp-includes/class-wp-meta-query.php

    r41688 r52473  
    696696            $sibling_compare = strtoupper( $sibling['compare'] );
    697697            if ( in_array( $clause_compare, $compatible_compares ) && in_array( $sibling_compare, $compatible_compares ) ) {
    698                 $alias = $sibling['alias'];
     698                $alias = preg_replace( '/\W/', '_', $sibling['alias'] );
    699699                break;
    700700            }
  • branches/5.0/src/wp-includes/class-wp-tax-query.php

    r41688 r52473  
    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.0/src/wp-includes/formatting.php

    r49396 r52473  
    10851085 *
    10861086 * @since 1.5.0
    1087  *
    1088  * @param string $utf8_string
    1089  * @param int    $length Max  length of the string
     1087 * @since 5.8.3 Added the `encode_ascii_characters` parameter.
     1088 *
     1089 * @param string $utf8_string             String to encode.
     1090 * @param int    $length                  Max length of the string
     1091 * @param bool   $encode_ascii_characters Whether to encode ascii characters such as < " '
    10901092 * @return string String with Unicode encoded for URI.
    10911093 */
    1092 function utf8_uri_encode( $utf8_string, $length = 0 ) {
     1094function utf8_uri_encode( $utf8_string, $length = 0, $encode_ascii_characters = false ) {
    10931095    $unicode        = '';
    10941096    $values         = array();
     
    11051107
    11061108        if ( $value < 128 ) {
    1107             if ( $length && ( $unicode_length >= $length ) ) {
     1109            $char                = chr( $value );
     1110            $encoded_char        = $encode_ascii_characters ? rawurlencode( $char ) : $char;
     1111            $encoded_char_length = strlen( $encoded_char );
     1112            if ( $length && ( $unicode_length + $encoded_char_length ) > $length ) {
    11081113                break;
    11091114            }
    1110             $unicode .= chr( $value );
    1111             $unicode_length++;
     1115            $unicode        .= $encoded_char;
     1116            $unicode_length += $encoded_char_length;
    11121117        } else {
    11131118            if ( count( $values ) == 0 ) {
  • branches/5.0/src/wp-includes/post.php

    r47647 r52473  
    40604060            $slug = substr( $slug, 0, $length );
    40614061        else
    4062             $slug = utf8_uri_encode( $decoded_slug, $length );
     4062            $slug = utf8_uri_encode( $decoded_slug, $length, true );
    40634063    }
    40644064
Note: See TracChangeset for help on using the changeset viewer.