--- a/wp/wp-includes/comment.php Thu Sep 29 08:06:27 2022 +0200
+++ b/wp/wp-includes/comment.php Fri Sep 05 18:40:08 2025 +0200
@@ -97,7 +97,7 @@
* 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;
}
@@ -136,7 +136,7 @@
$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;
@@ -149,13 +149,19 @@
}
/**
- * 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.
*/
@@ -171,7 +177,7 @@
);
$parsed_args = wp_parse_args( $args, $defaults );
- $query = new WP_Comment_Query;
+ $query = new WP_Comment_Query();
return $query->query( $parsed_args );
}
@@ -236,11 +242,11 @@
* @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 );
}
@@ -272,7 +278,7 @@
*
* @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 ) {
@@ -390,6 +396,7 @@
$args = array(
'count' => true,
'update_comment_meta_cache' => false,
+ 'orderby' => 'none',
);
if ( $post_id > 0 ) {
$args['post_id'] = $post_id;
@@ -449,7 +456,7 @@
* @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 = '' ) {
@@ -465,7 +472,7 @@
*
* @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.
@@ -479,6 +486,21 @@
}
/**
+ * 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
@@ -495,7 +517,7 @@
* @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.
@@ -505,30 +527,6 @@
}
/**
- * 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.
*
@@ -559,10 +557,11 @@
* 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 ) );
@@ -654,8 +653,10 @@
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'] ),
@@ -726,7 +727,7 @@
* @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
@@ -749,7 +750,7 @@
* @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
@@ -859,7 +860,6 @@
* @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.
@@ -986,8 +986,10 @@
* @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 bool $threaded Optional. Control over flat or threaded comments.
+ * @param int $per_page Optional. Comments per page. Defaults to the value of `comments_per_page`
+ * 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 ) {
@@ -1024,13 +1026,13 @@
}
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;
}
/**
@@ -1040,7 +1042,7 @@
*
* @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.
*
@@ -1050,17 +1052,17 @@
* @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;
}
@@ -1114,6 +1116,7 @@
'fields' => 'ids',
'count' => true,
'status' => 'approve',
+ 'orderby' => 'none',
'parent' => 0,
'date_query' => array(
array(
@@ -1168,7 +1171,7 @@
// 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'] );
}
}
@@ -1176,7 +1179,7 @@
* 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 {
@@ -1197,9 +1200,9 @@
* @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 );
}
/**
@@ -1270,19 +1273,19 @@
$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;
@@ -1354,11 +1357,10 @@
if ( empty( $word ) ) {
continue; }
- // Do some escaping magic so that '#' chars
- // in the spam words don't break things:
+ // Do some escaping magic so that '#' chars 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 )
@@ -1447,6 +1449,7 @@
*/
function wp_delete_comment( $comment_id, $force_delete = false ) {
global $wpdb;
+
$comment = get_comment( $comment_id );
if ( ! $comment ) {
return false;
@@ -1837,7 +1840,7 @@
*
* @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 );
@@ -1991,17 +1994,18 @@
*/
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'];
@@ -2011,7 +2015,26 @@
$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;
}
@@ -2019,7 +2042,7 @@
$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 ) {
@@ -2069,12 +2092,12 @@
/**
* Filters the comment author's user ID before it is set.
*
- * The first time this filter is evaluated, 'user_ID' is checked
- * (for back-compat), followed by the standard 'user_id' value.
+ * The first time this filter is evaluated, `user_ID` is checked
+ * (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'] ) ) {
@@ -2112,7 +2135,9 @@
$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;
}
@@ -2186,9 +2211,16 @@
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;
@@ -2212,11 +2244,14 @@
$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;
@@ -2244,12 +2279,14 @@
$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 );
- if ( ! $comment_ID ) {
+ $comment_id = wp_insert_comment( $commentdata );
+
+ if ( ! $comment_id ) {
$fields = array( 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_content' );
foreach ( $fields as $field ) {
@@ -2265,8 +2302,8 @@
return $commentdata['comment_approved'];
}
- $comment_ID = wp_insert_comment( $commentdata );
- if ( ! $comment_ID ) {
+ $comment_id = wp_insert_comment( $commentdata );
+ if ( ! $comment_id ) {
return false;
}
}
@@ -2277,13 +2314,13 @@
* @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 );
-
- return $comment_ID;
+ do_action( 'comment_post', $comment_id, $commentdata['comment_approved'], $commentdata );
+
+ return $comment_id;
}
/**
@@ -2291,23 +2328,23 @@
*
* @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 ) {
- $comment = get_comment( $comment_ID );
+function wp_new_comment_notify_moderator( $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 */
- $maybe_notify = apply_filters( 'notify_moderator', $maybe_notify, $comment_ID );
+ /** This filter is documented in wp-includes/pluggable.php */
+ $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 );
}
/**
@@ -2318,11 +2355,11 @@
* 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 ) {
- $comment = get_comment( $comment_ID );
+function wp_new_comment_notify_postauthor( $comment_id ) {
+ $comment = get_comment( $comment_id );
$maybe_notify = get_option( 'comments_notify' );
@@ -2333,9 +2370,9 @@
* @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.
@@ -2350,7 +2387,7 @@
return false;
}
- return wp_notify_postauthor( $comment_ID );
+ return wp_notify_postauthor( $comment_id );
}
/**
@@ -2447,6 +2484,7 @@
// 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.' ) );
@@ -2464,6 +2502,15 @@
}
}
+ $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 );
@@ -2474,6 +2521,10 @@
$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 );
@@ -2496,8 +2547,8 @@
$data['comment_approved'] = 1;
}
- $comment_ID = $data['comment_ID'];
- $comment_post_ID = $data['comment_post_ID'];
+ $comment_id = $data['comment_ID'];
+ $comment_post_id = $data['comment_post_ID'];
/**
* Filters the comment data immediately before it is updated in the database.
@@ -2523,12 +2574,28 @@
}
}
- $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' ) );
-
- if ( false === $rval ) {
+ $result = $wpdb->update( $wpdb->comments, $data, array( 'comment_ID' => $comment_id ) );
+
+ if ( false === $result ) {
if ( $wp_error ) {
return new WP_Error( 'db_update_error', __( 'Could not update comment in the database.' ), $wpdb->last_error );
} else {
@@ -2539,12 +2606,12 @@
// 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 );
- wp_update_comment_count( $comment_post_ID );
+ clean_comment_cache( $comment_id );
+ wp_update_comment_count( $comment_post_id );
/**
* Fires immediately after a comment is updated in the database.
@@ -2554,16 +2621,16 @@
* @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 );
-
- $comment = get_comment( $comment_ID );
+ do_action( 'edit_comment', $comment_id, $data );
+
+ $comment = get_comment( $comment_id );
wp_transition_comment_status( $comment->comment_approved, $old_status, $comment );
- return $rval;
+ return $result;
}
/**
@@ -2636,7 +2703,6 @@
} elseif ( $post_id ) {
return wp_update_comment_count_now( $post_id );
}
-
}
/**
@@ -2651,7 +2717,9 @@
*/
function wp_update_comment_count_now( $post_id ) {
global $wpdb;
+
$post_id = (int) $post_id;
+
if ( ! $post_id ) {
return false;
}
@@ -2660,6 +2728,7 @@
wp_cache_delete( "comments-{$post_id}", 'counts' );
$post = get_post( $post_id );
+
if ( ! $post ) {
return false;
}
@@ -2714,9 +2783,9 @@
/**
* Finds a pingback server URI based on the given URL.
*
- * 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
- * check for the rel="pingback" has more overhead than just the header.
+ * 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 check for the rel="pingback" has more overhead than just the header.
*
* @since 1.5.0
*
@@ -2741,7 +2810,7 @@
// 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;
}
@@ -2757,12 +2826,12 @@
return false;
}
- if ( wp_remote_retrieve_header( $response, 'x-pingback' ) ) {
- return wp_remote_retrieve_header( $response, 'x-pingback' );
+ if ( 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;
}
@@ -2886,21 +2955,25 @@
* 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;
@@ -2947,7 +3020,7 @@
* @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' );
@@ -2967,19 +3040,20 @@
* 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 ) {
- include_once ABSPATH . WPINC . '/class-IXR.php';
- include_once ABSPATH . WPINC . '/class-wp-http-ixr-client.php';
+function pingback( $content, $post ) {
+ require_once ABSPATH . WPINC . '/class-IXR.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;
}
@@ -3032,7 +3106,7 @@
*
* @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 ) );
@@ -3040,7 +3114,10 @@
$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 );
@@ -3098,10 +3175,10 @@
* @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 ) ) {
@@ -3112,7 +3189,7 @@
$options['timeout'] = 10;
$options['body'] = array(
'title' => $title,
- 'url' => get_permalink( $ID ),
+ 'url' => get_permalink( $post_id ),
'blog_name' => get_option( 'blogname' ),
'excerpt' => $excerpt,
);
@@ -3123,8 +3200,8 @@
return;
}
- $wpdb->query( $wpdb->prepare( "UPDATE $wpdb->posts SET pinged = CONCAT(pinged, '\n', %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, $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, $post_id ) );
}
/**
@@ -3136,8 +3213,8 @@
* @param string $path Path to send the ping.
*/
function weblog_ping( $server = '', $path = '' ) {
- include_once ABSPATH . WPINC . '/class-IXR.php';
- include_once ABSPATH . WPINC . '/class-wp-http-ixr-client.php';
+ require_once ABSPATH . WPINC . '/class-IXR.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 ) );
@@ -3211,7 +3288,7 @@
do_action( 'clean_comment_cache', $id );
}
- wp_cache_set( 'last_changed', microtime(), 'comment' );
+ wp_cache_set_comments_last_changed();
}
/**
@@ -3248,7 +3325,8 @@
* 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.
@@ -3263,7 +3341,11 @@
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 );
}
}
@@ -3377,17 +3459,16 @@
* @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;
- $comment_author = null;
- $comment_author_email = null;
- $comment_author_url = null;
- $comment_content = null;
+ $user_id = 0;
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'] ) );
@@ -3402,10 +3483,31 @@
$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 );
+
+ 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 );
+ $post = get_post( $comment_post_id );
if ( empty( $post->comment_status ) ) {
@@ -3414,9 +3516,9 @@
*
* @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' );
@@ -3425,22 +3527,22 @@
// 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 );
@@ -3451,9 +3553,9 @@
*
* @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' );
@@ -3464,39 +3566,37 @@
*
* @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 );
-
- if ( current_user_can( 'read_post', $comment_post_ID ) ) {
+ do_action( 'comment_on_draft', $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.
@@ -3505,13 +3605,15 @@
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.
@@ -3529,21 +3631,24 @@
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(
- 'comment_post_ID',
+ $commentdata = array(
+ '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'
);
/**
@@ -3556,7 +3661,7 @@
*/
$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 );
@@ -3570,7 +3675,7 @@
}
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 );
@@ -3581,8 +3686,8 @@
*
* @since 4.9.6
*
- * @param array $exporters An array of personal data exporters.
- * @return array An array of personal data exporters.
+ * @param array[] $exporters 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(
@@ -3599,8 +3704,13 @@
* @since 4.9.6
*
* @param string $email_address The comment author email address.
- * @param int $page Comment page.
- * @return array An array of personal data.
+ * @param int $page Comment page number.
+ * @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.
@@ -3614,7 +3724,7 @@
'author_email' => $email_address,
'number' => $number,
'paged' => $page,
- 'order_by' => 'comment_ID',
+ 'orderby' => 'comment_ID',
'order' => 'ASC',
'update_comment_meta_cache' => false,
)
@@ -3708,9 +3818,18 @@
*
* @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.
- * @return array
+ * @param int $page Comment page number.
+ * @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;
@@ -3735,7 +3854,7 @@
'author_email' => $email_address,
'number' => $number,
'paged' => $page,
- 'order_by' => 'comment_ID',
+ 'orderby' => 'comment_ID',
'order' => 'ASC',
'include_unapproved' => true,
)
@@ -3811,7 +3930,7 @@
* @since 5.0.0
*/
function wp_cache_set_comments_last_changed() {
- wp_cache_set( 'last_changed', microtime(), 'comment' );
+ wp_cache_set_last_changed( 'comment' );
}
/**