Changeset 52485 for branches/3.8
- Timestamp:
- 01/06/2022 06:26:53 PM (3 years ago)
- Location:
- branches/3.8
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/3.8
- Property svn:mergeinfo changed
/trunk merged: 52454,52456-52457
- Property svn:mergeinfo changed
-
branches/3.8/src/wp-admin/includes/upgrade.php
r32434 r52485 1042 1042 while( $rows = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options ORDER BY option_id LIMIT $start, 20" ) ) { 1043 1043 foreach( $rows as $row ) { 1044 $value = $row->option_value;1045 if ( !@unserialize( $value ))1044 $value = maybe_unserialize( $row->option_value ); 1045 if ( $value === $row->option_value ) 1046 1046 $value = stripslashes( $value ); 1047 1047 if ( $value !== $row->option_value ) { -
branches/3.8/src/wp-includes/formatting.php
r47661 r52485 678 678 * 679 679 * @since 1.5.0 680 * @since 5.8.3 Added the `encode_ascii_characters` parameter. 680 681 * 681 682 * @param string $utf8_string 682 683 * @param int $length Max length of the string 684 * @param bool $encode_ascii_characters Whether to encode ascii characters such as < " ' 683 685 * @return string String with Unicode encoded for URI. 684 686 */ 685 function utf8_uri_encode( $utf8_string, $length = 0 ) {687 function utf8_uri_encode( $utf8_string, $length = 0, $encode_ascii_characters = false ) { 686 688 $unicode = ''; 687 689 $values = array(); … … 695 697 696 698 if ( $value < 128 ) { 697 if ( $length && ( $unicode_length >= $length ) ) 699 $char = chr( $value ); 700 $encoded_char = $encode_ascii_characters ? rawurlencode( $char ) : $char; 701 $encoded_char_length = strlen( $encoded_char ); 702 if ( $length && ( $unicode_length + $encoded_char_length ) > $length ) { 698 703 break; 699 $unicode .= chr($value); 700 $unicode_length++; 704 } 705 $unicode .= $encoded_char; 706 $unicode_length += $encoded_char_length; 701 707 } else { 702 708 if ( count( $values ) == 0 ) $num_octets = ( $value < 224 ) ? 2 : 3; -
branches/3.8/src/wp-includes/post.php
r43404 r52485 3183 3183 $slug = substr( $slug, 0, $length ); 3184 3184 else 3185 $slug = utf8_uri_encode( $decoded_slug, $length );3185 $slug = utf8_uri_encode( $decoded_slug, $length, true ); 3186 3186 } 3187 3187 -
branches/3.8/src/wp-includes/taxonomy.php
r37141 r52485 813 813 } 814 814 815 $query['terms'] = array_unique( (array) $query['terms'] ); 815 if ( 'slug' === $query['field'] || 'name' === $query['field'] ) { 816 $query['terms'] = array_unique( (array) $query['terms'] ); 817 } else { 818 $query['terms'] = wp_parse_id_list( $query['terms'] ); 819 } 816 820 817 821 if ( is_taxonomy_hierarchical( $query['taxonomy'] ) && $query['include_children'] ) {
Note: See TracChangeset
for help on using the changeset viewer.