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

equal deleted inserted replaced

-:7b1b88e27a20
+:48c4eec2b7e6
 			/*
 			 * Check the comment fields for moderation keywords. If any are found,
 			 * fail the check for the given field by returning false.
 			 */
-			$pattern = "#$word#i";
+			$pattern = "#$word#iu";
 			if ( preg_match( $pattern, $author ) ) {
 				return false;
 			}
 			if ( preg_match( $pattern, $email ) ) {
 				return false;
 			} else {
 				// expected_slashed ($author, $email)
 				$ok_to_comment = $wpdb->get_var( $wpdb->prepare( "SELECT comment_approved FROM $wpdb->comments WHERE comment_author = %s AND comment_author_email = %s and comment_approved = '1' LIMIT 1", $author, $email ) );
 			}
 			if ( ( 1 == $ok_to_comment ) &&
-				( empty( $mod_keys ) || false === strpos( $email, $mod_keys ) ) ) {
+				( empty( $mod_keys ) || ! str_contains( $email, $mod_keys ) ) ) {
 					return true;
 			} else {
 				return false;
 			}
 		} else {
 	}
 	return true;
 }
 /**
-* Retrieves the approved comments for post $post_id.
+* Retrieves the approved comments for a post.
 *
 * @since 2.0.0
 * @since 4.1.0 Refactored to leverage WP_Comment_Query over a direct query.
 *
 * @param int   $post_id The ID of the post.
-* @param array $args    Optional. See WP_Comment_Query::__construct() for information on accepted arguments.
+* @param array $args    {
+*     Optional. See WP_Comment_Query::__construct() for information on accepted arguments.
+*
+*     @type int    $status  Comment status to limit results by. Defaults to approved comments.
+*     @type int    $post_id Limit results to those affiliated with a given post ID.
+*     @type string $order   How to order retrieved comments. Default 'ASC'.
+* }
 * @return WP_Comment[]|int[]|int The approved comments, or number of comments if `$count`
 *                                argument is true.
 */
 function get_approved_comments( $post_id, $args = array() ) {
 	if ( ! $post_id ) {
 		'post_id' => $post_id,
 		'order'   => 'ASC',
 	);
 	$parsed_args = wp_parse_args( $args, $defaults );
-	$query = new WP_Comment_Query;
+	$query = new WP_Comment_Query();
 	return $query->query( $parsed_args );
 }
 /**
 * Retrieves comment data given a comment ID or comment object.
 * The comment list can be for the blog as a whole or for an individual post.
 *
 * @since 2.7.0
 *
 * @param string|array $args Optional. Array or string of arguments. See WP_Comment_Query::__construct()
-*                           for information on accepted arguments. Default empty.
+*                           for information on accepted arguments. Default empty string.
 * @return WP_Comment[]|int[]|int List of comments or number of found comments if `$count` argument is true.
 */
 function get_comments( $args = '' ) {
-	$query = new WP_Comment_Query;
+	$query = new WP_Comment_Query();
 	return $query->query( $args );
 }
 /**
 * Retrieves all of the WordPress supported comment statuses.
 *
 * @since 4.3.0
 *
 * @param string $post_type    Optional. Post type. Default 'post'.
 * @param string $comment_type Optional. Comment type. Default 'comment'.
-* @return string Expected return value is 'open' or 'closed'.
+* @return string Either 'open' or 'closed'.
 */
 function get_default_comment_status( $post_type = 'post', $comment_type = 'comment' ) {
 	switch ( $comment_type ) {
 		case 'pingback':
 		case 'trackback':
 	);
 	$args = array(
 		'count'                     => true,
 		'update_comment_meta_cache' => false,
+		'orderby'                   => 'none',
 	);
 	if ( $post_id > 0 ) {
 		$args['post_id'] = $post_id;
 	}
 	$mapping       = array(
 *
 * @param int    $comment_id Comment ID.
 * @param string $meta_key   Metadata name.
 * @param mixed  $meta_value Optional. Metadata value. If provided,
 *                           rows will only be removed that match the value.
-*                           Must be serializable if non-scalar. Default empty.
+*                           Must be serializable if non-scalar. Default empty string.
 * @return bool True on success, false on failure.
 */
 function delete_comment_meta( $comment_id, $meta_key, $meta_value = '' ) {
 	return delete_metadata( 'comment', $comment_id, $meta_key, $meta_value );
 }
 *
 * @link https://developer.wordpress.org/reference/functions/get_comment_meta/
 *
 * @param int    $comment_id Comment ID.
 * @param string $key        Optional. The meta key to retrieve. By default,
-*                           returns data for all keys.
+*                           returns data for all keys. Default empty string.
 * @param bool   $single     Optional. Whether to return a single value.
 *                           This parameter has no effect if `$key` is not specified.
 *                           Default false.
 * @return mixed An array of values if `$single` is false.
 *               The value of meta data field if `$single` is true.
 function get_comment_meta( $comment_id, $key = '', $single = false ) {
 	return get_metadata( 'comment', $comment_id, $key, $single );
 }
 /**
+* Queue comment meta for lazy-loading.
+*
+* @since 6.3.0
+*
+* @param array $comment_ids List of comment IDs.
+*/
+function wp_lazyload_comment_meta( array $comment_ids ) {
+	if ( empty( $comment_ids ) ) {
+		return;
+	}
+	$lazyloader = wp_metadata_lazyloader();
+	$lazyloader->queue_objects( 'comment', $comment_ids );
+}
+/**
 * Updates comment meta field based on comment ID.
 *
 * Use the $prev_value parameter to differentiate between meta fields with the
 * same key and comment ID.
 *
 * @param int    $comment_id Comment ID.
 * @param string $meta_key   Metadata key.
 * @param mixed  $meta_value Metadata value. Must be serializable if non-scalar.
 * @param mixed  $prev_value Optional. Previous value to check before updating.
 *                           If specified, only update existing metadata entries with
-*                           this value. Otherwise, update all entries. Default empty.
+*                           this value. Otherwise, update all entries. Default empty string.
 * @return int|bool Meta ID if the key didn't exist, true on successful update,
 *                  false on failure or if the value passed to the function
 *                  is the same as the one that is already in the database.
 */
 function update_comment_meta( $comment_id, $meta_key, $meta_value, $prev_value = '' ) {
 	return update_metadata( 'comment', $comment_id, $meta_key, $meta_value, $prev_value );
-}
-/**
-* Queues comments for metadata lazy-loading.
-*
-* @since 4.5.0
-*
-* @param WP_Comment[] $comments Array of comment objects.
-*/
-function wp_queue_comments_for_comment_meta_lazyload( $comments ) {
-	// Don't use `wp_list_pluck()` to avoid by-reference manipulation.
-	$comment_ids = array();
-	if ( is_array( $comments ) ) {
-		foreach ( $comments as $comment ) {
-			if ( $comment instanceof WP_Comment ) {
-				$comment_ids[] = $comment->comment_ID;
-			}
-		}
-	}
-	if ( $comment_ids ) {
-		$lazyloader = wp_metadata_lazyloader();
-		$lazyloader->queue_objects( 'comment', $comment_ids );
-	}
 }
 /**
 * Sets the cookies used to store an unauthenticated commentator's identity. Typically used
 * to recall previous comments by this commentator that are still held in moderation.
 	/**
 	 * Filters the lifetime of the comment cookie in seconds.
 	 *
 	 * @since 2.8.0
-	 *
+	 * @since 6.6.0 The default $seconds value changed from 30000000 to YEAR_IN_SECONDS.
-	 * @param int $seconds Comment cookie lifetime. Default 30000000.
+	 *
-	 */
+	 * @param int $seconds Comment cookie lifetime. Default YEAR_IN_SECONDS.
-	$comment_cookie_lifetime = time() + apply_filters( 'comment_cookie_lifetime', 30000000 );
+	 */
+	$comment_cookie_lifetime = time() + apply_filters( 'comment_cookie_lifetime', YEAR_IN_SECONDS );
 	$secure = ( 'https' === parse_url( home_url(), PHP_URL_SCHEME ) );
 	setcookie( 'comment_author_' . COOKIEHASH, $comment->comment_author, $comment_cookie_lifetime, COOKIEPATH, COOKIE_DOMAIN, $secure );
 	setcookie( 'comment_author_email_' . COOKIEHASH, $comment->comment_author_email, $comment_cookie_lifetime, COOKIEPATH, COOKIE_DOMAIN, $secure );
 *                             If `$wp_error` is true, disallowed comments return a WP_Error.
 */
 function wp_allow_comment( $commentdata, $wp_error = false ) {
 	global $wpdb;
-	// Simple duplicate check.
+	/*
-	// expected_slashed ($comment_post_ID, $comment_author, $comment_author_email, $comment_content)
+	 * Simple duplicate check.
+	 * expected_slashed ($comment_post_ID, $comment_author, $comment_author_email, $comment_content)
+	 */
 	$dupe = $wpdb->prepare(
 		"SELECT comment_ID FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_parent = %s AND comment_approved != 'trash' AND ( comment_author = %s ",
 		wp_unslash( $commentdata['comment_post_ID'] ),
 		wp_unslash( $commentdata['comment_parent'] ),
 		wp_unslash( $commentdata['comment_author'] )
 	 *
 	 * @since 2.3.0
 	 * @since 4.7.0 The `$avoid_die` parameter was added.
 	 * @since 5.5.0 The `$avoid_die` parameter was renamed to `$wp_error`.
 	 *
-	 * @param string $comment_author_IP    Comment author's IP address.
+	 * @param string $comment_author_ip    Comment author's IP address.
 	 * @param string $comment_author_email Comment author's email.
 	 * @param string $comment_date_gmt     GMT date the comment was posted.
 	 * @param bool   $wp_error             Whether to return a WP_Error object instead of executing
 	 *                                     wp_die() or die() if a comment flood is occurring.
 	 */
 	 *
 	 * @since 4.7.0
 	 * @since 5.5.0 The `$avoid_die` parameter was renamed to `$wp_error`.
 	 *
 	 * @param bool   $is_flood             Is a comment flooding occurring? Default false.
-	 * @param string $comment_author_IP    Comment author's IP address.
+	 * @param string $comment_author_ip    Comment author's IP address.
 	 * @param string $comment_author_email Comment author's email.
 	 * @param string $comment_date_gmt     GMT date the comment was posted.
 	 * @param bool   $wp_error             Whether to return a WP_Error object instead of executing
 	 *                                     wp_die() or die() if a comment flood is occurring.
 	 */
 * @param bool   $avoid_die When true, a disallowed comment will result in the function
 *                          returning without executing wp_die() or die(). Default false.
 * @return bool Whether comment flooding is occurring.
 */
 function wp_check_comment_flood( $is_flood, $ip, $email, $date, $avoid_die = false ) {
 	global $wpdb;
 	// Another callback has declared a flood. Trust it.
 	if ( true === $is_flood ) {
 		return $is_flood;
 * @uses Walker_Comment
 *
 * @global WP_Query $wp_query WordPress Query object.
 *
 * @param WP_Comment[] $comments Optional. Array of WP_Comment objects. Defaults to `$wp_query->comments`.
-* @param int          $per_page Optional. Comments per page.
+* @param int          $per_page Optional. Comments per page. Defaults to the value of `comments_per_page`
-* @param bool         $threaded Optional. Control over flat or threaded comments.
+*                               query var, option of the same name, or 1 (in that order).
+* @param bool         $threaded Optional. Control over flat or threaded comments. Defaults to the value
+*                               of `thread_comments` option.
 * @return int Number of comment pages.
 */
 function get_comment_pages_count( $comments = null, $per_page = null, $threaded = null ) {
 	global $wp_query;
 	if ( ! isset( $threaded ) ) {
 		$threaded = get_option( 'thread_comments' );
 	}
 	if ( $threaded ) {
-		$walker = new Walker_Comment;
+		$walker = new Walker_Comment();
 		$count  = ceil( $walker->get_number_of_root_elements( $comments ) / $per_page );
 	} else {
 		$count = ceil( count( $comments ) / $per_page );
 	}
-	return $count;
+	return (int) $count;
 }
 /**
 * Calculates what page number a comment will appear on for comment paging.
 *
 * @since 2.7.0
 *
 * @global wpdb $wpdb WordPress database abstraction object.
 *
-* @param int   $comment_ID Comment ID.
+* @param int   $comment_id Comment ID.
 * @param array $args {
 *     Array of optional arguments.
 *
 *     @type string     $type      Limit paginated comments to those matching a given type.
 *                                 Accepts 'comment', 'trackback', 'pingback', 'pings'
 *                                 (trackbacks and pingbacks), or 'all'. Default 'all'.
 *     @type int        $per_page  Per-page count to use when calculating pagination.
 *                                 Defaults to the value of the 'comments_per_page' option.
 *     @type int|string $max_depth If greater than 1, comment page will be determined
-*                                 for the top-level parent `$comment_ID`.
+*                                 for the top-level parent `$comment_id`.
 *                                 Defaults to the value of the 'thread_comments_depth' option.
-* } *
+* }
 * @return int|null Comment page number or null on error.
 */
-function get_page_of_comment( $comment_ID, $args = array() ) {
+function get_page_of_comment( $comment_id, $args = array() ) {
 	global $wpdb;
 	$page = null;
-	$comment = get_comment( $comment_ID );
+	$comment = get_comment( $comment_id );
 	if ( ! $comment ) {
 		return;
 	}
 	$defaults      = array(
 			'type'       => $args['type'],
 			'post_id'    => $comment->comment_post_ID,
 			'fields'     => 'ids',
 			'count'      => true,
 			'status'     => 'approve',
+			'orderby'    => 'none',
 			'parent'     => 0,
 			'date_query' => array(
 				array(
 					'column' => "$wpdb->comments.comment_date_gmt",
 					'before' => $comment->comment_date_gmt,
 		if ( 0 == $older_comment_count ) {
 			$page = 1;
 			// Divide comments older than this one by comments per page to get this comment's page number.
 		} else {
-			$page = ceil( ( $older_comment_count + 1 ) / $args['per_page'] );
+			$page = (int) ceil( ( $older_comment_count + 1 ) / $args['per_page'] );
 		}
 	}
 	/**
 	 * Filters the calculated page on which a comment appears.
 	 *
 	 * @since 4.4.0
-	 * @since 4.7.0 Introduced the `$comment_ID` parameter.
+	 * @since 4.7.0 Introduced the `$comment_id` parameter.
 	 *
 	 * @param int   $page          Comment page.
 	 * @param array $args {
 	 *     Arguments used to calculate pagination. These include arguments auto-detected by the function,
 	 *     based on query vars, system settings, etc. For pristine arguments passed to the function,
 	 *     @type string $type      Type of comments to count.
 	 *     @type int    $page      Current comment page.
 	 *     @type int    $per_page  Number of comments per page.
 	 *     @type int    $max_depth Maximum comment threading depth allowed.
 	 * }
-	 * @param int $comment_ID ID of the comment.
+	 * @param int $comment_id ID of the comment.
 	 */
-	return apply_filters( 'get_page_of_comment', (int) $page, $args, $original_args, $comment_ID );
+	return apply_filters( 'get_page_of_comment', (int) $page, $args, $original_args, $comment_id );
 }
 /**
 * Retrieves the maximum character lengths for the comment form fields.
 *
 */
 function wp_check_comment_data_max_lengths( $comment_data ) {
 	$max_lengths = wp_get_comment_fields_max_lengths();
 	if ( isset( $comment_data['comment_author'] ) && mb_strlen( $comment_data['comment_author'], '8bit' ) > $max_lengths['comment_author'] ) {
-		return new WP_Error( 'comment_author_column_length', __( '<strong>Error</strong>: Your name is too long.' ), 200 );
+		return new WP_Error( 'comment_author_column_length', __( '<strong>Error:</strong> Your name is too long.' ), 200 );
 	}
 	if ( isset( $comment_data['comment_author_email'] ) && strlen( $comment_data['comment_author_email'] ) > $max_lengths['comment_author_email'] ) {
-		return new WP_Error( 'comment_author_email_column_length', __( '<strong>Error</strong>: Your email address is too long.' ), 200 );
+		return new WP_Error( 'comment_author_email_column_length', __( '<strong>Error:</strong> Your email address is too long.' ), 200 );
 	}
 	if ( isset( $comment_data['comment_author_url'] ) && strlen( $comment_data['comment_author_url'] ) > $max_lengths['comment_author_url'] ) {
-		return new WP_Error( 'comment_author_url_column_length', __( '<strong>Error</strong>: Your URL is too long.' ), 200 );
+		return new WP_Error( 'comment_author_url_column_length', __( '<strong>Error:</strong> Your URL is too long.' ), 200 );
 	}
 	if ( isset( $comment_data['comment_content'] ) && mb_strlen( $comment_data['comment_content'], '8bit' ) > $max_lengths['comment_content'] ) {
-		return new WP_Error( 'comment_content_column_length', __( '<strong>Error</strong>: Your comment is too long.' ), 200 );
+		return new WP_Error( 'comment_content_column_length', __( '<strong>Error:</strong> Your comment is too long.' ), 200 );
 	}
 	return true;
 }
 		// Skip empty lines.
 		if ( empty( $word ) ) {
 			continue; }
-		// Do some escaping magic so that '#' chars
+		// Do some escaping magic so that '#' chars in the spam words don't break things:
-		// in the spam words don't break things:
 		$word = preg_quote( $word, '#' );
-		$pattern = "#$word#i";
+		$pattern = "#$word#iu";
 		if ( preg_match( $pattern, $author )
 			|| preg_match( $pattern, $email )
 			|| preg_match( $pattern, $url )
 			|| preg_match( $pattern, $comment )
 			|| preg_match( $pattern, $comment_without_html )
 * @param bool           $force_delete Whether to bypass Trash and force deletion. Default false.
 * @return bool True on success, false on failure.
 */
 function wp_delete_comment( $comment_id, $force_delete = false ) {
 	global $wpdb;
 	$comment = get_comment( $comment_id );
 	if ( ! $comment ) {
 		return false;
 	}
 	 *  - `comment_spam_pingback`
 	 *  - `comment_spam_trackback`
 	 *
 	 * @since 2.7.0
 	 *
-	 * @param string     $comment_ID The comment ID as a numeric string.
+	 * @param string     $comment_id The comment ID as a numeric string.
 	 * @param WP_Comment $comment    Comment object.
 	 */
 	do_action( "comment_{$new_status}_{$comment->comment_type}", $comment->comment_ID, $comment );
 }
 * }
 * @return int|false The new comment's ID on success, false on failure.
 */
 function wp_insert_comment( $commentdata ) {
 	global $wpdb;
 	$data = wp_unslash( $commentdata );
 	$comment_author       = ! isset( $data['comment_author'] ) ? '' : $data['comment_author'];
 	$comment_author_email = ! isset( $data['comment_author_email'] ) ? '' : $data['comment_author_email'];
 	$comment_author_url   = ! isset( $data['comment_author_url'] ) ? '' : $data['comment_author_url'];
-	$comment_author_IP    = ! isset( $data['comment_author_IP'] ) ? '' : $data['comment_author_IP'];
+	$comment_author_ip    = ! isset( $data['comment_author_IP'] ) ? '' : $data['comment_author_IP'];
 	$comment_date     = ! isset( $data['comment_date'] ) ? current_time( 'mysql' ) : $data['comment_date'];
 	$comment_date_gmt = ! isset( $data['comment_date_gmt'] ) ? get_gmt_from_date( $comment_date ) : $data['comment_date_gmt'];
-	$comment_post_ID  = ! isset( $data['comment_post_ID'] ) ? 0 : $data['comment_post_ID'];
+	$comment_post_id  = ! isset( $data['comment_post_ID'] ) ? 0 : $data['comment_post_ID'];
 	$comment_content  = ! isset( $data['comment_content'] ) ? '' : $data['comment_content'];
 	$comment_karma    = ! isset( $data['comment_karma'] ) ? 0 : $data['comment_karma'];
 	$comment_approved = ! isset( $data['comment_approved'] ) ? 1 : $data['comment_approved'];
 	$comment_agent    = ! isset( $data['comment_agent'] ) ? '' : $data['comment_agent'];
 	$comment_type     = empty( $data['comment_type'] ) ? 'comment' : $data['comment_type'];
 	$comment_parent   = ! isset( $data['comment_parent'] ) ? 0 : $data['comment_parent'];
 	$user_id = ! isset( $data['user_id'] ) ? 0 : $data['user_id'];
-	$compacted = compact( 'comment_post_ID', 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_author_IP', 'comment_date', 'comment_date_gmt', 'comment_content', 'comment_karma', 'comment_approved', 'comment_agent', 'comment_type', 'comment_parent', 'user_id' );
+	$compacted = array(
+		'comment_post_ID'   => $comment_post_id,
+		'comment_author_IP' => $comment_author_ip,
+	);
+	$compacted += compact(
+		'comment_author',
+		'comment_author_email',
+		'comment_author_url',
+		'comment_date',
+		'comment_date_gmt',
+		'comment_content',
+		'comment_karma',
+		'comment_approved',
+		'comment_agent',
+		'comment_type',
+		'comment_parent',
+		'user_id'
+	);
 	if ( ! $wpdb->insert( $wpdb->comments, $compacted ) ) {
 		return false;
 	}
 	$id = (int) $wpdb->insert_id;
 	if ( 1 == $comment_approved ) {
-		wp_update_comment_count( $comment_post_ID );
+		wp_update_comment_count( $comment_post_id );
 		$data = array();
 		foreach ( array( 'server', 'gmt', 'blog' ) as $timezone ) {
 			$data[] = "lastcommentmodified:$timezone";
 		}
 function wp_filter_comment( $commentdata ) {
 	if ( isset( $commentdata['user_ID'] ) ) {
 		/**
 		 * Filters the comment author's user ID before it is set.
 		 *
-		 * The first time this filter is evaluated, 'user_ID' is checked
+		 * The first time this filter is evaluated, `user_ID` is checked
-		 * (for back-compat), followed by the standard 'user_id' value.
+		 * (for back-compat), followed by the standard `user_id` value.
 		 *
 		 * @since 1.5.0
 		 *
-		 * @param int $user_ID The comment author's user ID.
+		 * @param int $user_id The comment author's user ID.
 		 */
 		$commentdata['user_id'] = apply_filters( 'pre_user_id', $commentdata['user_ID'] );
 	} elseif ( isset( $commentdata['user_id'] ) ) {
 		/** This filter is documented in wp-includes/comment.php */
 		$commentdata['user_id'] = apply_filters( 'pre_user_id', $commentdata['user_id'] );
 	$commentdata['comment_author_IP'] = apply_filters( 'pre_comment_user_ip', $commentdata['comment_author_IP'] );
 	/** This filter is documented in wp-includes/comment.php */
 	$commentdata['comment_author_url'] = apply_filters( 'pre_comment_author_url', $commentdata['comment_author_url'] );
 	/** This filter is documented in wp-includes/comment.php */
 	$commentdata['comment_author_email'] = apply_filters( 'pre_comment_author_email', $commentdata['comment_author_email'] );
-	$commentdata['filtered']             = true;
+	$commentdata['filtered'] = true;
 	return $commentdata;
 }
 /**
 * Determines whether a comment should be blocked because of comment flood.
 * @return int|false|WP_Error The ID of the comment on success, false or WP_Error on failure.
 */
 function wp_new_comment( $commentdata, $wp_error = false ) {
 	global $wpdb;
+	/*
+	 * Normalize `user_ID` to `user_id`, but pass the old key
+	 * to the `preprocess_comment` filter for backward compatibility.
+	 */
 	if ( isset( $commentdata['user_ID'] ) ) {
 		$commentdata['user_ID'] = (int) $commentdata['user_ID'];
 		$commentdata['user_id'] = $commentdata['user_ID'];
+	} elseif ( isset( $commentdata['user_id'] ) ) {
+		$commentdata['user_id'] = (int) $commentdata['user_id'];
+		$commentdata['user_ID'] = $commentdata['user_id'];
 	}
 	$prefiltered_user_id = ( isset( $commentdata['user_id'] ) ) ? (int) $commentdata['user_id'] : 0;
 	if ( ! isset( $commentdata['comment_author_IP'] ) ) {
 	 * @param array $commentdata Comment data.
 	 */
 	$commentdata = apply_filters( 'preprocess_comment', $commentdata );
 	$commentdata['comment_post_ID'] = (int) $commentdata['comment_post_ID'];
+	// Normalize `user_ID` to `user_id` again, after the filter.
 	if ( isset( $commentdata['user_ID'] ) && $prefiltered_user_id !== (int) $commentdata['user_ID'] ) {
 		$commentdata['user_ID'] = (int) $commentdata['user_ID'];
 		$commentdata['user_id'] = $commentdata['user_ID'];
 	} elseif ( isset( $commentdata['user_id'] ) ) {
 		$commentdata['user_id'] = (int) $commentdata['user_id'];
+		$commentdata['user_ID'] = $commentdata['user_id'];
 	}
 	$commentdata['comment_parent'] = isset( $commentdata['comment_parent'] ) ? absint( $commentdata['comment_parent'] ) : 0;
 	$parent_status = ( $commentdata['comment_parent'] > 0 ) ? wp_get_comment_status( $commentdata['comment_parent'] ) : '';
 	}
 	$commentdata = wp_filter_comment( $commentdata );
 	$commentdata['comment_approved'] = wp_allow_comment( $commentdata, $wp_error );
 	if ( is_wp_error( $commentdata['comment_approved'] ) ) {
 		return $commentdata['comment_approved'];
 	}
-	$comment_ID = wp_insert_comment( $commentdata );
+	$comment_id = wp_insert_comment( $commentdata );
-	if ( ! $comment_ID ) {
+	if ( ! $comment_id ) {
 		$fields = array( 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_content' );
 		foreach ( $fields as $field ) {
 			if ( isset( $commentdata[ $field ] ) ) {
 				$commentdata[ $field ] = $wpdb->strip_invalid_text_for_column( $wpdb->comments, $field, $commentdata[ $field ] );
 		$commentdata['comment_approved'] = wp_allow_comment( $commentdata, $wp_error );
 		if ( is_wp_error( $commentdata['comment_approved'] ) ) {
 			return $commentdata['comment_approved'];
 		}
-		$comment_ID = wp_insert_comment( $commentdata );
+		$comment_id = wp_insert_comment( $commentdata );
-		if ( ! $comment_ID ) {
+		if ( ! $comment_id ) {
 			return false;
 		}
 	}
 	/**
 	 * Fires immediately after a comment is inserted into the database.
 	 *
 	 * @since 1.2.0
 	 * @since 4.5.0 The `$commentdata` parameter was added.
 	 *
-	 * @param int        $comment_ID       The comment ID.
+	 * @param int        $comment_id       The comment ID.
 	 * @param int|string $comment_approved 1 if the comment is approved, 0 if not, 'spam' if spam.
 	 * @param array      $commentdata      Comment data.
 	 */
-	do_action( 'comment_post', $comment_ID, $commentdata['comment_approved'], $commentdata );
+	do_action( 'comment_post', $comment_id, $commentdata['comment_approved'], $commentdata );
-	return $comment_ID;
+	return $comment_id;
 }
 /**
 * Sends a comment moderation notification to the comment moderator.
 *
 * @since 4.4.0
 *
-* @param int $comment_ID ID of the comment.
+* @param int $comment_id ID of the comment.
 * @return bool True on success, false on failure.
 */
-function wp_new_comment_notify_moderator( $comment_ID ) {
+function wp_new_comment_notify_moderator( $comment_id ) {
-	$comment = get_comment( $comment_ID );
+	$comment = get_comment( $comment_id );
 	// Only send notifications for pending comments.
 	$maybe_notify = ( '0' == $comment->comment_approved );
-	/** This filter is documented in wp-includes/comment.php */
+	/** This filter is documented in wp-includes/pluggable.php */
-	$maybe_notify = apply_filters( 'notify_moderator', $maybe_notify, $comment_ID );
+	$maybe_notify = apply_filters( 'notify_moderator', $maybe_notify, $comment_id );
 	if ( ! $maybe_notify ) {
 		return false;
 	}
-	return wp_notify_moderator( $comment_ID );
+	return wp_notify_moderator( $comment_id );
 }
 /**
 * Sends a notification of a new comment to the post author.
 *
 * @since 4.4.0
 *
 * Uses the {@see 'notify_post_author'} filter to determine whether the post author
 * should be notified when a new comment is added, overriding site setting.
 *
-* @param int $comment_ID Comment ID.
+* @param int $comment_id Comment ID.
 * @return bool True on success, false on failure.
 */
-function wp_new_comment_notify_postauthor( $comment_ID ) {
+function wp_new_comment_notify_postauthor( $comment_id ) {
-	$comment = get_comment( $comment_ID );
+	$comment = get_comment( $comment_id );
 	$maybe_notify = get_option( 'comments_notify' );
 	/**
 	 * Filters whether to send the post author new comment notification emails,
 	 * overriding the site setting.
 	 *
 	 * @since 4.4.0
 	 *
 	 * @param bool $maybe_notify Whether to notify the post author about the new comment.
-	 * @param int  $comment_ID   The ID of the comment for the notification.
+	 * @param int  $comment_id   The ID of the comment for the notification.
 	 */
-	$maybe_notify = apply_filters( 'notify_post_author', $maybe_notify, $comment_ID );
+	$maybe_notify = apply_filters( 'notify_post_author', $maybe_notify, $comment_id );
 	/*
 	 * wp_notify_postauthor() checks if notifying the author of their own comment.
 	 * By default, it won't, but filters can override this.
 	 */
 	// Only send notifications for approved comments.
 	if ( ! isset( $comment->comment_approved ) || '1' != $comment->comment_approved ) {
 		return false;
 	}
-	return wp_notify_postauthor( $comment_ID );
+	return wp_notify_postauthor( $comment_id );
 }
 /**
 * Sets the status of a comment.
 *
 function wp_update_comment( $commentarr, $wp_error = false ) {
 	global $wpdb;
 	// First, get all of the original fields.
 	$comment = get_comment( $commentarr['comment_ID'], ARRAY_A );
 	if ( empty( $comment ) ) {
 		if ( $wp_error ) {
 			return new WP_Error( 'invalid_comment_id', __( 'Invalid comment ID.' ) );
 		} else {
 			return false;
 		} else {
 			return false;
 		}
 	}
+	$filter_comment = false;
+	if ( ! has_filter( 'pre_comment_content', 'wp_filter_kses' ) ) {
+		$filter_comment = ! user_can( isset( $comment['user_id'] ) ? $comment['user_id'] : 0, 'unfiltered_html' );
+	}
+	if ( $filter_comment ) {
+		add_filter( 'pre_comment_content', 'wp_filter_kses' );
+	}
 	// Escape data pulled from DB.
 	$comment = wp_slash( $comment );
 	$old_status = $comment['comment_approved'];
 	// Merge old and new fields with new fields overwriting old ones.
 	$commentarr = array_merge( $comment, $commentarr );
 	$commentarr = wp_filter_comment( $commentarr );
+	if ( $filter_comment ) {
+		remove_filter( 'pre_comment_content', 'wp_filter_kses' );
+	}
 	// Now extract the merged array.
 	$data = wp_unslash( $commentarr );
 	/**
 		$data['comment_approved'] = 0;
 	} elseif ( 'approve' === $data['comment_approved'] ) {
 		$data['comment_approved'] = 1;
 	}
-	$comment_ID      = $data['comment_ID'];
+	$comment_id      = $data['comment_ID'];
-	$comment_post_ID = $data['comment_post_ID'];
+	$comment_post_id = $data['comment_post_ID'];
 	/**
 	 * Filters the comment data immediately before it is updated in the database.
 	 *
 	 * Note: data being passed to the filter is already unslashed.
 		} else {
 			return false;
 		}
 	}
-	$keys = array( 'comment_post_ID', 'comment_content', 'comment_author', 'comment_author_email', 'comment_approved', 'comment_karma', 'comment_author_url', 'comment_date', 'comment_date_gmt', 'comment_type', 'comment_parent', 'user_id', 'comment_agent', 'comment_author_IP' );
+	$keys = array(
+		'comment_post_ID',
+		'comment_author',
+		'comment_author_email',
+		'comment_author_url',
+		'comment_author_IP',
+		'comment_date',
+		'comment_date_gmt',
+		'comment_content',
+		'comment_karma',
+		'comment_approved',
+		'comment_agent',
+		'comment_type',
+		'comment_parent',
+		'user_id',
+	);
 	$data = wp_array_slice_assoc( $data, $keys );
-	$rval = $wpdb->update( $wpdb->comments, $data, compact( 'comment_ID' ) );
+	$result = $wpdb->update( $wpdb->comments, $data, array( 'comment_ID' => $comment_id ) );
-	if ( false === $rval ) {
+	if ( false === $result ) {
 		if ( $wp_error ) {
 			return new WP_Error( 'db_update_error', __( 'Could not update comment in the database.' ), $wpdb->last_error );
 		} else {
 			return false;
 		}
 	}
 	// If metadata is provided, store it.
 	if ( isset( $commentarr['comment_meta'] ) && is_array( $commentarr['comment_meta'] ) ) {
 		foreach ( $commentarr['comment_meta'] as $meta_key => $meta_value ) {
-			update_comment_meta( $comment_ID, $meta_key, $meta_value );
+			update_comment_meta( $comment_id, $meta_key, $meta_value );
 		}
 	}
-	clean_comment_cache( $comment_ID );
+	clean_comment_cache( $comment_id );
-	wp_update_comment_count( $comment_post_ID );
+	wp_update_comment_count( $comment_post_id );
 	/**
 	 * Fires immediately after a comment is updated in the database.
 	 *
 	 * The hook also fires immediately before comment status transition hooks are fired.
 	 *
 	 * @since 1.2.0
 	 * @since 4.6.0 Added the `$data` parameter.
 	 *
-	 * @param int   $comment_ID The comment ID.
+	 * @param int   $comment_id The comment ID.
 	 * @param array $data       Comment data.
 	 */
-	do_action( 'edit_comment', $comment_ID, $data );
+	do_action( 'edit_comment', $comment_id, $data );
-	$comment = get_comment( $comment_ID );
+	$comment = get_comment( $comment_id );
 	wp_transition_comment_status( $comment->comment_approved, $old_status, $comment );
-	return $rval;
+	return $result;
 }
 /**
 * Determines whether to defer comment counting.
 *
 		$_deferred[] = $post_id;
 		return true;
 	} elseif ( $post_id ) {
 		return wp_update_comment_count_now( $post_id );
 	}
 }
 /**
 * Updates the comment count for the post.
 *
 * @param int $post_id Post ID
 * @return bool True on success, false if the post does not exist.
 */
 function wp_update_comment_count_now( $post_id ) {
 	global $wpdb;
 	$post_id = (int) $post_id;
 	if ( ! $post_id ) {
 		return false;
 	}
 	wp_cache_delete( 'comments-0', 'counts' );
 	wp_cache_delete( "comments-{$post_id}", 'counts' );
 	$post = get_post( $post_id );
 	if ( ! $post ) {
 		return false;
 	}
 	$old = (int) $post->comment_count;
 //
 /**
 * Finds a pingback server URI based on the given URL.
 *
-* Checks the HTML for the rel="pingback" link and x-pingback headers. It does
+* Checks the HTML for the rel="pingback" link and X-Pingback headers. It does
-* a check for the x-pingback headers first and returns that, if available. The
+* a check for the X-Pingback headers first and returns that, if available.
-* check for the rel="pingback" has more overhead than just the header.
+* The check for the rel="pingback" has more overhead than just the header.
 *
 * @since 1.5.0
 *
 * @param string $url        URL to ping.
 * @param string $deprecated Not Used.
 		return false;
 	}
 	// Do not search for a pingback server on our own uploads.
 	$uploads_dir = wp_get_upload_dir();
-	if ( 0 === strpos( $url, $uploads_dir['baseurl'] ) ) {
+	if ( str_starts_with( $url, $uploads_dir['baseurl'] ) ) {
 		return false;
 	}
 	$response = wp_safe_remote_head(
 		$url,
 	if ( is_wp_error( $response ) ) {
 		return false;
 	}
-	if ( wp_remote_retrieve_header( $response, 'x-pingback' ) ) {
+	if ( wp_remote_retrieve_header( $response, 'X-Pingback' ) ) {
-		return wp_remote_retrieve_header( $response, 'x-pingback' );
+		return wp_remote_retrieve_header( $response, 'X-Pingback' );
 	}
 	// Not an (x)html, sgml, or xml page, no use going further.
-	if ( preg_match( '#(image|audio|video|model)/#is', wp_remote_retrieve_header( $response, 'content-type' ) ) ) {
+	if ( preg_match( '#(image|audio|video|model)/#is', wp_remote_retrieve_header( $response, 'Content-Type' ) ) ) {
 		return false;
 	}
 	// Now do a GET since we're going to look in the HTML headers (and we're sure it's not a binary file).
 	$response = wp_safe_remote_get(
 /**
 * Performs trackbacks.
 *
 * @since 1.5.0
-* @since 4.7.0 `$post_id` can be a WP_Post object.
+* @since 4.7.0 `$post` can be a WP_Post object.
 *
 * @global wpdb $wpdb WordPress database abstraction object.
 *
-* @param int|WP_Post $post_id Post object or ID to do trackbacks on.
+* @param int|WP_Post $post Post ID or object to do trackbacks on.
-*/
+* @return void|false Returns false on failure.
-function do_trackbacks( $post_id ) {
+*/
+function do_trackbacks( $post ) {
 	global $wpdb;
-	$post = get_post( $post_id );
+	$post = get_post( $post );
 	if ( ! $post ) {
 		return false;
 	}
 	$to_ping = get_to_ping( $post );
 	$pinged  = get_pung( $post );
 	if ( empty( $to_ping ) ) {
 		$wpdb->update( $wpdb->posts, array( 'to_ping' => '' ), array( 'ID' => $post->ID ) );
 		return;
 	}
 * Sends pings to all of the ping site services.
 *
 * @since 1.2.0
 *
 * @param int $post_id Post ID.
-* @return int Same as Post ID from parameter
+* @return int Same post ID as provided.
 */
 function generic_ping( $post_id = 0 ) {
 	$services = get_option( 'ping_sites' );
 	$services = explode( "\n", $services );
 /**
 * Pings back the links found in a post.
 *
 * @since 0.71
-* @since 4.7.0 `$post_id` can be a WP_Post object.
+* @since 4.7.0 `$post` can be a WP_Post object.
 *
 * @param string      $content Post content to check for links. If empty will retrieve from post.
-* @param int|WP_Post $post_id Post Object or ID.
+* @param int|WP_Post $post    Post ID or object.
 */
-function pingback( $content, $post_id ) {
+function pingback( $content, $post ) {
-	include_once ABSPATH . WPINC . '/class-IXR.php';
+	require_once ABSPATH . WPINC . '/class-IXR.php';
-	include_once ABSPATH . WPINC . '/class-wp-http-ixr-client.php';
+	require_once ABSPATH . WPINC . '/class-wp-http-ixr-client.php';
 	// Original code by Mort (http://mort.mine.nu:8080).
 	$post_links = array();
-	$post = get_post( $post_id );
+	$post = get_post( $post );
 	if ( ! $post ) {
 		return;
 	}
 	$pung = get_pung( $post );
 	 *
 	 * @since 2.0.0
 	 *
 	 * @param string[] $post_links Array of link URLs to be checked (passed by reference).
 	 * @param string[] $pung       Array of link URLs already pinged (passed by reference).
-	 * @param int      $post_ID    The post ID.
+	 * @param int      $post_id    The post ID.
 	 */
 	do_action_ref_array( 'pre_ping', array( &$post_links, &$pung, $post->ID ) );
 	foreach ( (array) $post_links as $pagelinkedto ) {
 		$pingback_server_url = discover_pingback_server_uri( $pagelinkedto );
 		if ( $pingback_server_url ) {
-			set_time_limit( 60 );
+			if ( function_exists( 'set_time_limit' ) ) {
+				set_time_limit( 60 );
+			}
 			// Now, the RPC call.
 			$pagelinkedfrom = get_permalink( $post );
 			// Using a timeout of 3 seconds should be enough to cover slow servers.
 			$client          = new WP_HTTP_IXR_Client( $pingback_server_url );
 * @global wpdb $wpdb WordPress database abstraction object.
 *
 * @param string $trackback_url URL to send trackbacks.
 * @param string $title         Title of post.
 * @param string $excerpt       Excerpt of post.
-* @param int    $ID            Post ID.
+* @param int    $post_id       Post ID.
 * @return int|false|void Database query from update.
 */
-function trackback( $trackback_url, $title, $excerpt, $ID ) {
+function trackback( $trackback_url, $title, $excerpt, $post_id ) {
 	global $wpdb;
 	if ( empty( $trackback_url ) ) {
 		return;
 	}
 	$options            = array();
 	$options['timeout'] = 10;
 	$options['body']    = array(
 		'title'     => $title,
-		'url'       => get_permalink( $ID ),
+		'url'       => get_permalink( $post_id ),
 		'blog_name' => get_option( 'blogname' ),
 		'excerpt'   => $excerpt,
 	);
 	$response = wp_safe_remote_post( $trackback_url, $options );
 	if ( is_wp_error( $response ) ) {
 		return;
 	}
-	$wpdb->query( $wpdb->prepare( "UPDATE $wpdb->posts SET pinged = CONCAT(pinged, '\n', %s) WHERE ID = %d", $trackback_url, $ID ) );
+	$wpdb->query( $wpdb->prepare( "UPDATE $wpdb->posts SET pinged = CONCAT(pinged, '\n', %s) WHERE ID = %d", $trackback_url, $post_id ) );
-	return $wpdb->query( $wpdb->prepare( "UPDATE $wpdb->posts SET to_ping = TRIM(REPLACE(to_ping, %s, '')) WHERE ID = %d", $trackback_url, $ID ) );
+	return $wpdb->query( $wpdb->prepare( "UPDATE $wpdb->posts SET to_ping = TRIM(REPLACE(to_ping, %s, '')) WHERE ID = %d", $trackback_url, $post_id ) );
 }
 /**
 * Sends a pingback.
 *
 *
 * @param string $server Host of blog to connect to.
 * @param string $path Path to send the ping.
 */
 function weblog_ping( $server = '', $path = '' ) {
-	include_once ABSPATH . WPINC . '/class-IXR.php';
+	require_once ABSPATH . WPINC . '/class-IXR.php';
-	include_once ABSPATH . WPINC . '/class-wp-http-ixr-client.php';
+	require_once ABSPATH . WPINC . '/class-wp-http-ixr-client.php';
 	// Using a timeout of 3 seconds should be enough to cover slow servers.
 	$client             = new WP_HTTP_IXR_Client( $server, ( ( ! strlen( trim( $path ) ) || ( '/' === $path ) ) ? false : $path ) );
 	$client->timeout    = 3;
 	$client->useragent .= ' -- WordPress/' . get_bloginfo( 'version' );
 		 * @param int $id Comment ID.
 		 */
 		do_action( 'clean_comment_cache', $id );
 	}
-	wp_cache_set( 'last_changed', microtime(), 'comment' );
+	wp_cache_set_comments_last_changed();
 }
 /**
 * Updates the comment cache of given comments.
 *
 /**
 * Adds any comments from the given IDs to the cache that do not already exist in cache.
 *
 * @since 4.4.0
-* @access private
+* @since 6.1.0 This function is no longer marked as "private".
+* @since 6.3.0 Use wp_lazyload_comment_meta() for lazy-loading of comment meta.
 *
 * @see update_comment_cache()
 * @global wpdb $wpdb WordPress database abstraction object.
 *
 * @param int[] $comment_ids       Array of comment IDs.
 	$non_cached_ids = _get_non_cached_ids( $comment_ids, 'comment' );
 	if ( ! empty( $non_cached_ids ) ) {
 		$fresh_comments = $wpdb->get_results( sprintf( "SELECT $wpdb->comments.* FROM $wpdb->comments WHERE comment_ID IN (%s)", implode( ',', array_map( 'intval', $non_cached_ids ) ) ) );
-		update_comment_cache( $fresh_comments, $update_meta_cache );
+		update_comment_cache( $fresh_comments, false );
+	}
+	if ( $update_meta_cache ) {
+		wp_lazyload_comment_meta( $comment_ids );
 	}
 }
 //
 // Internal.
 *     @type string     $_wp_unfiltered_html_comment The nonce value for allowing unfiltered HTML.
 * }
 * @return WP_Comment|WP_Error A WP_Comment object on success, a WP_Error object on failure.
 */
 function wp_handle_comment_submission( $comment_data ) {
+	$comment_post_id      = 0;
-	$comment_post_ID      = 0;
+	$comment_author       = '';
+	$comment_author_email = '';
+	$comment_author_url   = '';
+	$comment_content      = '';
 	$comment_parent       = 0;
-	$user_ID              = 0;
+	$user_id              = 0;
-	$comment_author       = null;
-	$comment_author_email = null;
-	$comment_author_url   = null;
-	$comment_content      = null;
 	if ( isset( $comment_data['comment_post_ID'] ) ) {
-		$comment_post_ID = (int) $comment_data['comment_post_ID'];
+		$comment_post_id = (int) $comment_data['comment_post_ID'];
 	}
 	if ( isset( $comment_data['author'] ) && is_string( $comment_data['author'] ) ) {
 		$comment_author = trim( strip_tags( $comment_data['author'] ) );
 	}
 	if ( isset( $comment_data['email'] ) && is_string( $comment_data['email'] ) ) {
 	}
 	if ( isset( $comment_data['comment'] ) && is_string( $comment_data['comment'] ) ) {
 		$comment_content = trim( $comment_data['comment'] );
 	}
 	if ( isset( $comment_data['comment_parent'] ) ) {
-		$comment_parent = absint( $comment_data['comment_parent'] );
+		$comment_parent        = absint( $comment_data['comment_parent'] );
-	}
+		$comment_parent_object = get_comment( $comment_parent );
-	$post = get_post( $comment_post_ID );
+		if (
+			0 !== $comment_parent &&
+			(
+				! $comment_parent_object instanceof WP_Comment ||
+				0 === (int) $comment_parent_object->comment_approved
+			)
+		) {
+			/**
+			 * Fires when a comment reply is attempted to an unapproved comment.
+			 *
+			 * @since 6.2.0
+			 *
+			 * @param int $comment_post_id Post ID.
+			 * @param int $comment_parent  Parent comment ID.
+			 */
+			do_action( 'comment_reply_to_unapproved_comment', $comment_post_id, $comment_parent );
+			return new WP_Error( 'comment_reply_to_unapproved_comment', __( 'Sorry, replies to unapproved comments are not allowed.' ), 403 );
+		}
+	}
+	$post = get_post( $comment_post_id );
 	if ( empty( $post->comment_status ) ) {
 		/**
 		 * Fires when a comment is attempted on a post that does not exist.
 		 *
 		 * @since 1.5.0
 		 *
-		 * @param int $comment_post_ID Post ID.
+		 * @param int $comment_post_id Post ID.
 		 */
-		do_action( 'comment_id_not_found', $comment_post_ID );
+		do_action( 'comment_id_not_found', $comment_post_id );
 		return new WP_Error( 'comment_id_not_found' );
 	}
 	// get_post_status() will get the parent status for attachments.
 	$status = get_post_status( $post );
-	if ( ( 'private' === $status ) && ! current_user_can( 'read_post', $comment_post_ID ) ) {
+	if ( ( 'private' === $status ) && ! current_user_can( 'read_post', $comment_post_id ) ) {
 		return new WP_Error( 'comment_id_not_found' );
 	}
 	$status_obj = get_post_status_object( $status );
-	if ( ! comments_open( $comment_post_ID ) ) {
+	if ( ! comments_open( $comment_post_id ) ) {
 		/**
 		 * Fires when a comment is attempted on a post that has comments closed.
 		 *
 		 * @since 1.5.0
 		 *
-		 * @param int $comment_post_ID Post ID.
+		 * @param int $comment_post_id Post ID.
 		 */
-		do_action( 'comment_closed', $comment_post_ID );
+		do_action( 'comment_closed', $comment_post_id );
 		return new WP_Error( 'comment_closed', __( 'Sorry, comments are closed for this item.' ), 403 );
 	} elseif ( 'trash' === $status ) {
 		/**
 		 * Fires when a comment is attempted on a trashed post.
 		 *
 		 * @since 2.9.0
 		 *
-		 * @param int $comment_post_ID Post ID.
+		 * @param int $comment_post_id Post ID.
 		 */
-		do_action( 'comment_on_trash', $comment_post_ID );
+		do_action( 'comment_on_trash', $comment_post_id );
 		return new WP_Error( 'comment_on_trash' );
 	} elseif ( ! $status_obj->public && ! $status_obj->private ) {
 		/**
 		 * Fires when a comment is attempted on a post in draft mode.
 		 *
 		 * @since 1.5.1
 		 *
-		 * @param int $comment_post_ID Post ID.
+		 * @param int $comment_post_id Post ID.
 		 */
-		do_action( 'comment_on_draft', $comment_post_ID );
+		do_action( 'comment_on_draft', $comment_post_id );
-		if ( current_user_can( 'read_post', $comment_post_ID ) ) {
+		if ( current_user_can( 'read_post', $comment_post_id ) ) {
 			return new WP_Error( 'comment_on_draft', __( 'Sorry, comments are not allowed for this item.' ), 403 );
 		} else {
 			return new WP_Error( 'comment_on_draft' );
 		}
-	} elseif ( post_password_required( $comment_post_ID ) ) {
+	} elseif ( post_password_required( $comment_post_id ) ) {
 		/**
 		 * Fires when a comment is attempted on a password-protected post.
 		 *
 		 * @since 2.9.0
 		 *
-		 * @param int $comment_post_ID Post ID.
+		 * @param int $comment_post_id Post ID.
 		 */
-		do_action( 'comment_on_password_protected', $comment_post_ID );
+		do_action( 'comment_on_password_protected', $comment_post_id );
 		return new WP_Error( 'comment_on_password_protected' );
 	} else {
 		/**
 		 * Fires before a comment is posted.
 		 *
 		 * @since 2.8.0
 		 *
-		 * @param int $comment_post_ID Post ID.
+		 * @param int $comment_post_id Post ID.
 		 */
-		do_action( 'pre_comment_on_post', $comment_post_ID );
+		do_action( 'pre_comment_on_post', $comment_post_id );
 	}
 	// If the user is logged in.
 	$user = wp_get_current_user();
 	if ( $user->exists() ) {
 		if ( empty( $user->display_name ) ) {
 			$user->display_name = $user->user_login;
 		}
 		$comment_author       = $user->display_name;
 		$comment_author_email = $user->user_email;
 		$comment_author_url   = $user->user_url;
-		$user_ID              = $user->ID;
+		$user_id              = $user->ID;
 		if ( current_user_can( 'unfiltered_html' ) ) {
 			if ( ! isset( $comment_data['_wp_unfiltered_html_comment'] )
-				|| ! wp_verify_nonce( $comment_data['_wp_unfiltered_html_comment'], 'unfiltered-html-comment_' . $comment_post_ID )
+				|| ! wp_verify_nonce( $comment_data['_wp_unfiltered_html_comment'], 'unfiltered-html-comment_' . $comment_post_id )
 			) {
 				kses_remove_filters(); // Start with a clean slate.
 				kses_init_filters();   // Set up the filters.
 				remove_filter( 'pre_comment_content', 'wp_filter_post_kses' );
 				add_filter( 'pre_comment_content', 'wp_filter_kses' );
 	$comment_type = 'comment';
 	if ( get_option( 'require_name_email' ) && ! $user->exists() ) {
 		if ( '' == $comment_author_email || '' == $comment_author ) {
-			return new WP_Error( 'require_name_email', __( '<strong>Error</strong>: Please fill the required fields.' ), 200 );
+			return new WP_Error( 'require_name_email', __( '<strong>Error:</strong> Please fill the required fields.' ), 200 );
 		} elseif ( ! is_email( $comment_author_email ) ) {
-			return new WP_Error( 'require_valid_email', __( '<strong>Error</strong>: Please enter a valid email address.' ), 200 );
+			return new WP_Error( 'require_valid_email', __( '<strong>Error:</strong> Please enter a valid email address.' ), 200 );
 		}
 	}
-	$commentdata = compact(
+	$commentdata = array(
-		'comment_post_ID',
+		'comment_post_ID' => $comment_post_id,
+	);
+	$commentdata += compact(
 		'comment_author',
 		'comment_author_email',
 		'comment_author_url',
 		'comment_content',
 		'comment_type',
 		'comment_parent',
-		'user_ID'
+		'user_id'
 	);
 	/**
 	 * Filters whether an empty comment should be allowed.
 	 *
 	 * @param bool  $allow_empty_comment Whether to allow empty comments. Default false.
 	 * @param array $commentdata         Array of comment data to be sent to wp_insert_comment().
 	 */
 	$allow_empty_comment = apply_filters( 'allow_empty_comment', false, $commentdata );
 	if ( '' === $comment_content && ! $allow_empty_comment ) {
-		return new WP_Error( 'require_valid_comment', __( '<strong>Error</strong>: Please type your comment text.' ), 200 );
+		return new WP_Error( 'require_valid_comment', __( '<strong>Error:</strong> Please type your comment text.' ), 200 );
 	}
 	$check_max_lengths = wp_check_comment_data_max_lengths( $commentdata );
 	if ( is_wp_error( $check_max_lengths ) ) {
 		return $check_max_lengths;
 	if ( is_wp_error( $comment_id ) ) {
 		return $comment_id;
 	}
 	if ( ! $comment_id ) {
-		return new WP_Error( 'comment_save_error', __( '<strong>Error</strong>: The comment could not be saved. Please try again later.' ), 500 );
+		return new WP_Error( 'comment_save_error', __( '<strong>Error:</strong> The comment could not be saved. Please try again later.' ), 500 );
 	}
 	return get_comment( $comment_id );
 }
 /**
 * Registers the personal data exporter for comments.
 *
 * @since 4.9.6
 *
-* @param array $exporters An array of personal data exporters.
+* @param array[] $exporters An array of personal data exporters.
-* @return array An array of personal data exporters.
+* @return array[] An array of personal data exporters.
 */
 function wp_register_comment_personal_data_exporter( $exporters ) {
 	$exporters['wordpress-comments'] = array(
 		'exporter_friendly_name' => __( 'WordPress Comments' ),
 		'callback'               => 'wp_comments_personal_data_exporter',
 * Finds and exports personal data associated with an email address from the comments table.
 *
 * @since 4.9.6
 *
 * @param string $email_address The comment author email address.
-* @param int    $page          Comment page.
+* @param int    $page          Comment page number.
-* @return array An array of personal data.
+* @return array {
+*     An array of personal data.
+*
+*     @type array[] $data An array of personal data arrays.
+*     @type bool    $done Whether the exporter is finished.
+* }
 */
 function wp_comments_personal_data_exporter( $email_address, $page = 1 ) {
 	// Limit us to 500 comments at a time to avoid timing out.
 	$number = 500;
 	$page   = (int) $page;
 	$comments = get_comments(
 		array(
 			'author_email'              => $email_address,
 			'number'                    => $number,
 			'paged'                     => $page,
-			'order_by'                  => 'comment_ID',
+			'orderby'                   => 'comment_ID',
 			'order'                     => 'ASC',
 			'update_comment_meta_cache' => false,
 		)
 	);
 /**
 * Erases personal data associated with an email address from the comments table.
 *
 * @since 4.9.6
 *
+* @global wpdb $wpdb WordPress database abstraction object.
+*
 * @param string $email_address The comment author email address.
-* @param int    $page          Comment page.
+* @param int    $page          Comment page number.
-* @return array
+* @return array {
+*     Data removal results.
+*
+*     @type bool     $items_removed  Whether items were actually removed.
+*     @type bool     $items_retained Whether items were retained.
+*     @type string[] $messages       An array of messages to add to the personal data export file.
+*     @type bool     $done           Whether the eraser is finished.
+* }
 */
 function wp_comments_personal_data_eraser( $email_address, $page = 1 ) {
 	global $wpdb;
 	if ( empty( $email_address ) ) {
 	$comments = get_comments(
 		array(
 			'author_email'       => $email_address,
 			'number'             => $number,
 			'paged'              => $page,
-			'order_by'           => 'comment_ID',
+			'orderby'            => 'comment_ID',
 			'order'              => 'ASC',
 			'include_unapproved' => true,
 		)
 	);
 * Sets the last changed time for the 'comment' cache group.
 *
 * @since 5.0.0
 */
 function wp_cache_set_comments_last_changed() {
-	wp_cache_set( 'last_changed', microtime(), 'comment' );
+	wp_cache_set_last_changed( 'comment' );
 }
 /**
 * Updates the comment type for a batch of comments.
 *

changeset 21	48c4eec2b7e6
parent 19	3d72ae0968f4
child 22	8c2e4d02f4ef