Changeset 53503

Timestamp:

06/14/2022 04:15:52 PM (2 years ago)

Author:

SergeyBiryukov

Message:

Docs: Add a comment for stripping the leading AND from SQL clauses in some query classes.

Follow-up to [30084], [34529], [34542], [36598], [37477], [37572], [43010].

See #55646.

Location:

trunk/src/wp-includes

Files:

• class-wp-comment-query.php (modified) (1 diff)
• class-wp-site-query.php (modified) (1 diff)
• class-wp-term-query.php (modified) (8 diffs)

trunk/src/wp-includes/class-wp-comment-query.php

@@ -912 +912 @@
 
         if ( ! empty( $this->query_vars['date_query'] ) && is_array( $this->query_vars['date_query'] ) ) {
-            $this->date_query                         = new WP_Date_Query( $this->query_vars['date_query'], 'comment_date' );
+            $this->date_query = new WP_Date_Query( $this->query_vars['date_query'], 'comment_date' );
+
+            // Strip leading 'AND'.
             $this->sql_clauses['where']['date_query'] = preg_replace( '/^\s*AND\s*/', '', $this->date_query->get_sql() );
         }

trunk/src/wp-includes/class-wp-site-query.php

@@ -627 +627 @@
         $date_query = $this->query_vars['date_query'];
         if ( ! empty( $date_query ) && is_array( $date_query ) ) {
-            $this->date_query                         = new WP_Date_Query( $date_query, 'registered' );
+            $this->date_query = new WP_Date_Query( $date_query, 'registered' );
+
+            // Strip leading 'AND'.
             $this->sql_clauses['where']['date_query'] = preg_replace( '/^\s*AND\s*/', '', $this->date_query->get_sql() );
         }

trunk/src/wp-includes/class-wp-term-query.php

@@ -485 +485 @@
             $exclude_tree      = wp_parse_id_list( $exclude_tree );
             $excluded_children = $exclude_tree;
+
             foreach ( $exclude_tree as $extrunk ) {
                 $excluded_children = array_merge(
@@ -498 +499 @@
                 );
             }
+
             $exclusions = array_merge( $excluded_children, $exclusions );
         }
@@ -532 +534 @@
 
         if ( ! empty( $exclusions ) ) {
-            // Must do string manipulation here for backward compatibility with filter.
+            // Strip leading 'AND'. Must do string manipulation here for backward compatibility with filter.
             $this->sql_clauses['where']['exclusions'] = preg_replace( '/^\s*AND\s*/', '', $exclusions );
         }
@@ -544 +546 @@
         if ( ! empty( $args['name'] ) ) {
             $names = $args['name'];
+
             foreach ( $names as &$_name ) {
                 // `sanitize_term_field()` returns slashed data.
@@ -651 +654 @@
 
         if ( ! empty( $meta_clauses ) ) {
-            $join                                    .= $mq_sql['join'];
+            $join .= $mq_sql['join'];
+
+            // Strip leading 'AND'.
             $this->sql_clauses['where']['meta_query'] = preg_replace( '/^\s*AND\s*/', '', $mq_sql['where'] );
-            $distinct                                .= 'DISTINCT';
+
+            $distinct .= 'DISTINCT';
 
         }
@@ -786 +792 @@
                 $cache = array_map( 'intval', $cache );
             } elseif ( 'count' !== $_fields ) {
-                if ( ( 'all_with_object_id' === $_fields && ! empty( $args['object_ids'] ) ) || ( 'all' === $_fields && $args['pad_counts'] ) ) {
+                if ( ( 'all_with_object_id' === $_fields && ! empty( $args['object_ids'] ) )
+                    || ( 'all' === $_fields && $args['pad_counts'] )
+                ) {
                     $term_ids = wp_list_pluck( $cache, 'term_id' );
                 } else {
                     $term_ids = array_map( 'intval', $cache );
                 }
+
                 _prime_term_caches( $term_ids, $args['update_term_meta_cache'] );
+
                 $term_objects = $this->populate_terms( $cache );
                 $cache        = $this->format_terms( $term_objects, $_fields );
@@ -838 +848 @@
                 if ( ! $term->count ) {
                     $children = get_term_children( $term->term_id, $term->taxonomy );
+
                     if ( is_array( $children ) ) {
                         foreach ( $children as $child_id ) {
@@ -887 +898 @@
             $term_cache = wp_list_pluck( $term_objects, 'term_id' );
         }
+
         wp_cache_add( $cache_key, $term_cache, 'terms' );
         $this->terms = $this->format_terms( $term_objects, $_fields );