Changeset 52472 for branches/5.1/src/wp-includes/formatting.php

Timestamp:

01/06/2022 06:12:33 PM (3 years ago)

Author:

desrosj

Message:

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

Location:

branches/5.1

Files:

• . (modified) (1 prop)
• src/wp-includes/formatting.php (modified) (2 diffs)

branches/5.1/src/wp-includes/formatting.php

@@ -1151 +1151 @@
  *
  * @since 1.5.0
- *
- * @param string $utf8_string
- * @param int    $length Max  length of the string
+ * @since 5.8.3 Added the `encode_ascii_characters` parameter.
+ *
+ * @param string $utf8_string             String to encode.
+ * @param int    $length                  Max length of the string
+ * @param bool   $encode_ascii_characters Whether to encode ascii characters such as < " '
  * @return string String with Unicode encoded for URI.
  */
-function utf8_uri_encode( $utf8_string, $length = 0 ) {
+function utf8_uri_encode( $utf8_string, $length = 0, $encode_ascii_characters = false ) {
     $unicode        = '';
     $values         = array();
@@ -1171 +1173 @@
 
         if ( $value < 128 ) {
-            if ( $length && ( $unicode_length >= $length ) ) {
+            $char                = chr( $value );
+            $encoded_char        = $encode_ascii_characters ? rawurlencode( $char ) : $char;
+            $encoded_char_length = strlen( $encoded_char );
+            if ( $length && ( $unicode_length + $encoded_char_length ) > $length ) {
                 break;
             }
-            $unicode .= chr( $value );
-            $unicode_length++;
+            $unicode        .= $encoded_char;
+            $unicode_length += $encoded_char_length;
         } else {
             if ( count( $values ) == 0 ) {