Make WordPress Core


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

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

Location:
branches/4.6
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/4.6

  • branches/4.6/src/wp-includes/formatting.php

    r49400 r52477  
    10651065 *
    10661066 * @since 1.5.0
    1067  *
    1068  * @param string $utf8_string
    1069  * @param int    $length Max  length of the string
     1067 * @since 5.8.3 Added the `encode_ascii_characters` parameter.
     1068 *
     1069 * @param string $utf8_string             String to encode.
     1070 * @param int    $length                  Max length of the string
     1071 * @param bool   $encode_ascii_characters Whether to encode ascii characters such as < " '
    10701072 * @return string String with Unicode encoded for URI.
    10711073 */
    1072 function utf8_uri_encode( $utf8_string, $length = 0 ) {
     1074function utf8_uri_encode( $utf8_string, $length = 0, $encode_ascii_characters = false ) {
    10731075    $unicode        = '';
    10741076    $values         = array();
     
    10851087
    10861088        if ( $value < 128 ) {
    1087             if ( $length && ( $unicode_length >= $length ) ) {
     1089            $char                = chr( $value );
     1090            $encoded_char        = $encode_ascii_characters ? rawurlencode( $char ) : $char;
     1091            $encoded_char_length = strlen( $encoded_char );
     1092            if ( $length && ( $unicode_length + $encoded_char_length ) > $length ) {
    10881093                break;
    10891094            }
    1090             $unicode .= chr( $value );
    1091             $unicode_length++;
     1095            $unicode        .= $encoded_char;
     1096            $unicode_length += $encoded_char_length;
    10921097        } else {
    10931098            if ( count( $values ) == 0 ) {
Note: See TracChangeset for help on using the changeset viewer.