Changeset 52477 for branches/4.6/src/wp-includes/class-wp-tax-query.php

Timestamp:

01/06/2022 06:16:25 PM (5 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:

• . (modified) (1 prop)
• src/wp-includes/class-wp-tax-query.php (modified) (2 diffs)

branches/4.6/src/wp-includes/class-wp-tax-query.php

@@ -544 +544 @@
                         // The sibling must both have compatible operator to share its alias.
                         if ( in_array( strtoupper( $sibling['operator'] ), $compatible_operators ) ) {
-                                $alias = $sibling['alias'];
+                                $alias = preg_replace( '/\W/', '_', $sibling['alias'] );
                                 break;
                         }
@@ -574 +574 @@
                 }
 
-                $query['terms'] = array_unique( (array) $query['terms'] );
+                if ( 'slug' === $query['field'] || 'name' === $query['field'] ) {
+                        $query['terms'] = array_unique( (array) $query['terms'] );
+                } else {
+                        $query['terms'] = wp_parse_id_list( $query['terms'] );
+                }
 
                 if ( is_taxonomy_hierarchical( $query['taxonomy'] ) && $query['include_children'] ) {