enmi-conf.org: comparison wp/wp-includes/class-wp-comment-query.php

equal deleted inserted replaced

-:7b1b88e27a20
+:48c4eec2b7e6
 *
 * @since 3.1.0
 *
 * @see WP_Comment_Query::__construct() for accepted arguments.
 */
+#[AllowDynamicProperties]
 class WP_Comment_Query {
 	/**
 	 * SQL for database query.
 	 *
 	 *                                                      comment objects (false). Default false.
 	 *     @type array           $date_query                Date query clauses to limit comments by. See WP_Date_Query.
 	 *                                                      Default null.
 	 *     @type string          $fields                    Comment fields to return. Accepts 'ids' for comment IDs
 	 *                                                      only or empty for all fields. Default empty.
-	 *     @type int             $ID                        Currently unused.
 	 *     @type array           $include_unapproved        Array of IDs or email addresses of users whose unapproved
 	 *                                                      comments will be returned by the query regardless of
 	 *                                                      `$status`. Default empty.
 	 *     @type int             $karma                     Karma score to retrieve matching comments for.
 	 *                                                      Default empty.
 	 *     @type string|string[] $meta_key                  Meta key or keys to filter by.
 	 *     @type string|string[] $meta_value                Meta value or values to filter by.
 	 *     @type string          $meta_compare              MySQL operator used for comparing the meta value.
-	 *                                                      See WP_Meta_Query::__construct for accepted values and default value.
+	 *                                                      See WP_Meta_Query::__construct() for accepted values and default value.
 	 *     @type string          $meta_compare_key          MySQL operator used for comparing the meta key.
-	 *                                                      See WP_Meta_Query::__construct for accepted values and default value.
+	 *                                                      See WP_Meta_Query::__construct() for accepted values and default value.
 	 *     @type string          $meta_type                 MySQL data type that the meta_value column will be CAST to for comparisons.
-	 *                                                      See WP_Meta_Query::__construct for accepted values and default value.
+	 *                                                      See WP_Meta_Query::__construct() for accepted values and default value.
 	 *     @type string          $meta_type_key             MySQL data type that the meta_key column will be CAST to for comparisons.
-	 *                                                      See WP_Meta_Query::__construct for accepted values and default value.
+	 *                                                      See WP_Meta_Query::__construct() for accepted values and default value.
 	 *     @type array           $meta_query                An associative array of WP_Meta_Query arguments.
-	 *                                                      See WP_Meta_Query::__construct for accepted values.
+	 *                                                      See WP_Meta_Query::__construct() for accepted values.
 	 *     @type int             $number                    Maximum number of comments to retrieve.
 	 *                                                      Default empty (no limit).
 	 *     @type int             $paged                     When used with `$number`, defines the page of results to return.
 	 *                                                      When used with `$offset`, `$offset` takes precedence. Default 1.
 	 *     @type int             $offset                    Number of comments to offset the query. Used to build
 	 *                                                      children for. Default empty.
 	 *     @type int[]           $post_author__in           Array of author IDs to retrieve comments for.
 	 *                                                      Default empty.
 	 *     @type int[]           $post_author__not_in       Array of author IDs *not* to retrieve comments for.
 	 *                                                      Default empty.
-	 *     @type int             $post_ID                   Currently unused.
 	 *     @type int             $post_id                   Limit results to those affiliated with a given post ID.
 	 *                                                      Default 0.
 	 *     @type int[]           $post__in                  Array of post IDs to include affiliated comments for.
 	 *                                                      Default empty.
 	 *     @type int[]           $post__not_in              Array of post IDs to exclude affiliated comments for.
 	/**
 	 * Parse arguments passed to the comment query with default query parameters.
 	 *
 	 * @since 4.2.0 Extracted from WP_Comment_Query::query().
 	 *
-	 * @param string|array $query WP_Comment_Query arguments. See WP_Comment_Query::__construct()
+	 * @param string|array $query WP_Comment_Query arguments. See WP_Comment_Query::__construct() for accepted arguments.
 	 */
 	public function parse_query( $query = '' ) {
 		if ( empty( $query ) ) {
 			$query = $this->query_vars;
 		}
 		$key          = md5( serialize( $_args ) );
 		$last_changed = wp_cache_get_last_changed( 'comment' );
 		$cache_key   = "get_comments:$key:$last_changed";
-		$cache_value = wp_cache_get( $cache_key, 'comment' );
+		$cache_value = wp_cache_get( $cache_key, 'comment-queries' );
 		if ( false === $cache_value ) {
 			$comment_ids = $this->get_comment_ids();
 			if ( $comment_ids ) {
 				$this->set_found_comments();
 			}
 			$cache_value = array(
 				'comment_ids'    => $comment_ids,
 				'found_comments' => $this->found_comments,
 			);
-			wp_cache_add( $cache_key, $cache_value, 'comment' );
+			wp_cache_add( $cache_key, $cache_value, 'comment-queries' );
 		} else {
 			$comment_ids          = $cache_value['comment_ids'];
 			$this->found_comments = $cache_value['found_comments'];
 		}
 		if ( $this->found_comments && $this->query_vars['number'] ) {
-			$this->max_num_pages = ceil( $this->found_comments / $this->query_vars['number'] );
+			$this->max_num_pages = (int) ceil( $this->found_comments / $this->query_vars['number'] );
 		}
 		// If querying for a count only, there's nothing more to do.
 		if ( $this->query_vars['count'] ) {
 			// $comment_ids is actually a count in this case.
 			return (int) $comment_ids;
 		}
 		$comment_ids = array_map( 'intval', $comment_ids );
+		if ( $this->query_vars['update_comment_meta_cache'] ) {
+			wp_lazyload_comment_meta( $comment_ids );
+		}
 		if ( 'ids' === $this->query_vars['fields'] ) {
 			$this->comments = $comment_ids;
 			return $this->comments;
 		}
-		_prime_comment_caches( $comment_ids, $this->query_vars['update_comment_meta_cache'] );
+		_prime_comment_caches( $comment_ids, false );
 		// Fetch full comment objects from the primed cache.
 		$_comments = array();
 		foreach ( $comment_ids as $comment_id ) {
 			$_comment = get_comment( $comment_id );
 		// User IDs or emails whose unapproved comments are included, regardless of $status.
 		if ( ! empty( $this->query_vars['include_unapproved'] ) ) {
 			$include_unapproved = wp_parse_list( $this->query_vars['include_unapproved'] );
-			$unapproved_ids    = array();
-			$unapproved_emails = array();
 			foreach ( $include_unapproved as $unapproved_identifier ) {
 				// Numeric values are assumed to be user IDs.
 				if ( is_numeric( $unapproved_identifier ) ) {
 					$approved_clauses[] = $wpdb->prepare( "( user_id = %d AND comment_approved = '0' )", $unapproved_identifier );
 				} else {
 				}
 				// If no date-related order is available, use the date from the first available clause.
 				if ( ! $comment_id_order ) {
 					foreach ( $orderby_array as $orderby_clause ) {
-						if ( false !== strpos( 'ASC', $orderby_clause ) ) {
+						if ( str_contains( 'ASC', $orderby_clause ) ) {
 							$comment_id_order = 'ASC';
 						} else {
 							$comment_id_order = 'DESC';
 						}
 				$groupby = "{$wpdb->comments}.comment_ID";
 			}
 		}
 		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() );
 		}
 		$where = implode( ' AND ', $this->sql_clauses['where'] );
-		$clauses = array( 'fields', 'join', 'where', 'orderby', 'limits', 'groupby' );
+		$pieces = array( 'fields', 'join', 'where', 'orderby', 'limits', 'groupby' );
 		/**
 		 * Filters the comment query clauses.
 		 *
 		 * @since 3.1.0
 		 *
-		 * @param string[]         $clauses An associative array of comment query clauses.
+		 * @param string[]         $clauses {
+		 *     Associative array of the clauses for the query.
+		 *
+		 *     @type string $fields   The SELECT clause of the query.
+		 *     @type string $join     The JOIN clause of the query.
+		 *     @type string $where    The WHERE clause of the query.
+		 *     @type string $orderby  The ORDER BY clause of the query.
+		 *     @type string $limits   The LIMIT clause of the query.
+		 *     @type string $groupby  The GROUP BY clause of the query.
+		 * }
 		 * @param WP_Comment_Query $query   Current instance of WP_Comment_Query (passed by reference).
 		 */
-		$clauses = apply_filters_ref_array( 'comments_clauses', array( compact( $clauses ), &$this ) );
+		$clauses = apply_filters_ref_array( 'comments_clauses', array( compact( $pieces ), &$this ) );
 		$fields  = isset( $clauses['fields'] ) ? $clauses['fields'] : '';
 		$join    = isset( $clauses['join'] ) ? $clauses['join'] : '';
 		$where   = isset( $clauses['where'] ) ? $clauses['where'] : '';
 		$orderby = isset( $clauses['orderby'] ) ? $clauses['orderby'] : '';
 		$this->sql_clauses['from']    = "FROM $wpdb->comments $join";
 		$this->sql_clauses['groupby'] = $groupby;
 		$this->sql_clauses['orderby'] = $orderby;
 		$this->sql_clauses['limits']  = $limits;
-		$this->request = "
+		// Beginning of the string is on a new line to prevent leading whitespace. See https://core.trac.wordpress.org/ticket/56841.
-			{$this->sql_clauses['select']}
+		$this->request =
-			{$this->sql_clauses['from']}
+			"{$this->sql_clauses['select']}
-			{$where}
+			 {$this->sql_clauses['from']}
-			{$this->sql_clauses['groupby']}
+			 {$where}
-			{$this->sql_clauses['orderby']}
+			 {$this->sql_clauses['groupby']}
-			{$this->sql_clauses['limits']}
+			 {$this->sql_clauses['orderby']}
-		";
+			 {$this->sql_clauses['limits']}";
 		if ( $this->query_vars['count'] ) {
 			return (int) $wpdb->get_var( $this->request );
 		} else {
 			$comment_ids = $wpdb->get_col( $this->request );
 	 * Instead of calling `get_children()` separately on each child comment, we do a single set of queries to fetch
 	 * the descendant trees for all matched top-level comments.
 	 *
 	 * @since 4.4.0
 	 *
-	 * @global wpdb $wpdb WordPress database abstraction object.
-	 *
 	 * @param WP_Comment[] $comments Array of top-level comments whose descendants should be filled in.
 	 * @return array
 	 */
 	protected function fill_descendants( $comments ) {
-		global $wpdb;
 		$levels = array(
 			0 => wp_list_pluck( $comments, 'comment_ID' ),
 		);
 		$key          = md5( serialize( wp_array_slice_assoc( $this->query_vars, array_keys( $this->query_var_defaults ) ) ) );
 		do {
 			// Parent-child relationships may be cached. Only query for those that are not.
 			$child_ids           = array();
 			$uncached_parent_ids = array();
 			$_parent_ids         = $levels[ $level ];
-			foreach ( $_parent_ids as $parent_id ) {
+			if ( $_parent_ids ) {
-				$cache_key        = "get_comment_child_ids:$parent_id:$key:$last_changed";
+				$cache_keys = array();
-				$parent_child_ids = wp_cache_get( $cache_key, 'comment' );
+				foreach ( $_parent_ids as $parent_id ) {
-				if ( false !== $parent_child_ids ) {
+					$cache_keys[ $parent_id ] = "get_comment_child_ids:$parent_id:$key:$last_changed";
-					$child_ids = array_merge( $child_ids, $parent_child_ids );
+				}
-				} else {
+				$cache_data = wp_cache_get_multiple( array_values( $cache_keys ), 'comment-queries' );
-					$uncached_parent_ids[] = $parent_id;
+				foreach ( $_parent_ids as $parent_id ) {
+					$parent_child_ids = $cache_data[ $cache_keys[ $parent_id ] ];
+					if ( false !== $parent_child_ids ) {
+						$child_ids = array_merge( $child_ids, $parent_child_ids );
+					} else {
+						$uncached_parent_ids[] = $parent_id;
+					}
 				}
 			}
 			if ( $uncached_parent_ids ) {
 				// Fetch this level of comments.
 				$data = array();
 				foreach ( $parent_map as $parent_id => $children ) {
 					$cache_key          = "get_comment_child_ids:$parent_id:$key:$last_changed";
 					$data[ $cache_key ] = $children;
 				}
-				wp_cache_set_multiple( $data, 'comment' );
+				wp_cache_set_multiple( $data, 'comment-queries' );
 			}
-			$level++;
+			++$level;
 			$levels[ $level ] = $child_ids;
 		} while ( $child_ids );
 		// Prime comment caches for non-top-level comments.
 		$descendant_ids = array();

changeset 21	48c4eec2b7e6
parent 19	3d72ae0968f4