WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Comments: Rename the `$avoid_die` parameter of `wp_allow_comment()` and `wp_new_comment()` to `$wp_error`. 

This makes the function signatures more consistent with `wp_update_comment()` and `wp_set_comment_status()`.

`wp_check_comment_flood()` is left as the only function with the `$avoid_die` parameter for now, as it does not return a `WP_Error` object.

Follow-up to [48154], [48207].

See #39732.
Built from https://develop.svn.wordpress.org/trunk@48208


git-svn-id: http://core.svn.wordpress.org/trunk@47977 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2020-06-28 22:10:06 +00:00
parent 8c721c9c34
commit 570b6e0866
2 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
wp-includes/comment.php
View File

@ -656,19 +656,20 @@ function sanitize_comment_cookies() {
* Validates whether this comment is allowed to be made. * Validates whether this comment is allowed to be made.
* *
* @since 2.0.0 * @since 2.0.0
* @since 4.7.0 The `$avoid_die` parameter was added, allowing the function to * @since 4.7.0 The `$avoid_die` parameter was added, allowing the function
* return a WP_Error object instead of dying. * to return a WP_Error object instead of dying.
* @since 5.5.0 The `$avoid_die` parameter was renamed to `$wp_error`.
* *
* @global wpdb $wpdb WordPress database abstraction object. * @global wpdb $wpdb WordPress database abstraction object.
* *
* @param array $commentdata Contains information on the comment. * @param array $commentdata Contains information on the comment.
* @param bool $avoid_die When true, a disallowed comment will result in the function * @param bool $wp_error When true, a disallowed comment will result in the function
* returning a WP_Error object, rather than executing wp_die(). * returning a WP_Error object, rather than executing wp_die().
* Default false. * Default false.
* @return int|string|WP_Error Allowed comments return the approval status (0|1|'spam'|'trash'). * @return int|string|WP_Error Allowed comments return the approval status (0|1|'spam'|'trash').
* If `$avoid_die` is true, disallowed comments return a WP_Error. * If `$wp_error` is true, disallowed comments return a WP_Error.
*/ */
function wp_allow_comment( $commentdata, $avoid_die = false ) { function wp_allow_comment( $commentdata, $wp_error = false ) {
global $wpdb; global $wpdb;
// Simple duplicate check. // Simple duplicate check.
@ -723,7 +724,7 @@ function wp_allow_comment( $commentdata, $avoid_die = false ) {
*/ */
$comment_duplicate_message = apply_filters( 'comment_duplicate_message', __( 'Duplicate comment detected; it looks as though you’ve already said that!' ) ); $comment_duplicate_message = apply_filters( 'comment_duplicate_message', __( 'Duplicate comment detected; it looks as though you’ve already said that!' ) );
if ( true === $avoid_die ) { if ( $wp_error ) {
return new WP_Error( 'comment_duplicate', $comment_duplicate_message, 409 ); return new WP_Error( 'comment_duplicate', $comment_duplicate_message, 409 );
} else { } else {
if ( wp_doing_ajax() ) { if ( wp_doing_ajax() ) {
@ -741,19 +742,20 @@ function wp_allow_comment( $commentdata, $avoid_die = false ) {
* *
* @since 2.3.0 * @since 2.3.0
* @since 4.7.0 The `$avoid_die` parameter was added. * @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_author_email Comment author's email.
* @param string $comment_date_gmt GMT date the comment was posted. * @param string $comment_date_gmt GMT date the comment was posted.
* @param bool $avoid_die Whether to prevent executing wp_die() * @param bool $wp_error Whether to return a WP_Error object instead of executing
* or die() if a comment flood is occurring. * wp_die() or die() if a comment flood is occurring.
*/ */
do_action( do_action(
'check_comment_flood', 'check_comment_flood',
$commentdata['comment_author_IP'], $commentdata['comment_author_IP'],
$commentdata['comment_author_email'], $commentdata['comment_author_email'],
$commentdata['comment_date_gmt'], $commentdata['comment_date_gmt'],
$avoid_die $wp_error
); );
/** /**
@ -762,13 +764,14 @@ function wp_allow_comment( $commentdata, $avoid_die = false ) {
* The default check is wp_check_comment_flood(). See check_comment_flood_db(). * The default check is wp_check_comment_flood(). See check_comment_flood_db().
* *
* @since 4.7.0 * @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 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_author_email Comment author's email.
* @param string $comment_date_gmt GMT date the comment was posted. * @param string $comment_date_gmt GMT date the comment was posted.
* @param bool $avoid_die Whether to prevent executing wp_die() * @param bool $wp_error Whether to return a WP_Error object instead of executing
* or die() if a comment flood is occurring. * wp_die() or die() if a comment flood is occurring.
*/ */
$is_flood = apply_filters( $is_flood = apply_filters(
'wp_is_comment_flood', 'wp_is_comment_flood',
@ -776,7 +779,7 @@ function wp_allow_comment( $commentdata, $avoid_die = false ) {
$commentdata['comment_author_IP'], $commentdata['comment_author_IP'],
$commentdata['comment_author_email'], $commentdata['comment_author_email'],
$commentdata['comment_date_gmt'], $commentdata['comment_date_gmt'],
$avoid_die $wp_error
); );
if ( $is_flood ) { if ( $is_flood ) {
@ -2139,8 +2142,9 @@ function wp_throttle_comment_flood( $block, $time_lastcomment, $time_newcomment
* *
* @since 1.5.0 * @since 1.5.0
* @since 4.3.0 Introduced the `comment_agent` and `comment_author_IP` arguments. * @since 4.3.0 Introduced the `comment_agent` and `comment_author_IP` arguments.
* @since 4.7.0 The `$avoid_die` parameter was added, allowing the function to * @since 4.7.0 The `$avoid_die` parameter was added, allowing the function
* return a WP_Error object instead of dying. * to return a WP_Error object instead of dying.
* @since 5.5.0 The `$avoid_die` parameter was renamed to `$wp_error`.
* @since 5.5.0 Introduced the `comment_type` argument. * @since 5.5.0 Introduced the `comment_type` argument.
* *
* @see wp_insert_comment() * @see wp_insert_comment()
@ -2166,11 +2170,11 @@ function wp_throttle_comment_flood( $block, $time_lastcomment, $time_newcomment
* @type string $comment_author_IP Comment author IP address in IPv4 format. Default is the value of * @type string $comment_author_IP Comment author IP address in IPv4 format. Default is the value of
* 'REMOTE_ADDR' in the `$_SERVER` superglobal sent in the original request. * 'REMOTE_ADDR' in the `$_SERVER` superglobal sent in the original request.
* } * }
* @param bool $avoid_die Should errors be returned as WP_Error objects instead of * @param bool $wp_error Should errors be returned as WP_Error objects instead of
* executing wp_die()? Default false. * executing wp_die()? Default false.
* @return int|false|WP_Error The ID of the comment on success, false or WP_Error on failure. * @return int|false|WP_Error The ID of the comment on success, false or WP_Error on failure.
*/ */
function wp_new_comment( $commentdata, $avoid_die = false ) { function wp_new_comment( $commentdata, $wp_error = false ) {
global $wpdb; global $wpdb;
if ( isset( $commentdata['user_ID'] ) ) { if ( isset( $commentdata['user_ID'] ) ) {
@ -2227,7 +2231,7 @@ function wp_new_comment( $commentdata, $avoid_die = false ) {
$commentdata = wp_filter_comment( $commentdata ); $commentdata = wp_filter_comment( $commentdata );
$commentdata['comment_approved'] = wp_allow_comment( $commentdata, $avoid_die ); $commentdata['comment_approved'] = wp_allow_comment( $commentdata, $wp_error );
if ( is_wp_error( $commentdata['comment_approved'] ) ) { if ( is_wp_error( $commentdata['comment_approved'] ) ) {
return $commentdata['comment_approved']; return $commentdata['comment_approved'];
} }
@ -2244,7 +2248,7 @@ function wp_new_comment( $commentdata, $avoid_die = false ) {
$commentdata = wp_filter_comment( $commentdata ); $commentdata = wp_filter_comment( $commentdata );
$commentdata['comment_approved'] = wp_allow_comment( $commentdata, $avoid_die ); $commentdata['comment_approved'] = wp_allow_comment( $commentdata, $wp_error );
if ( is_wp_error( $commentdata['comment_approved'] ) ) { if ( is_wp_error( $commentdata['comment_approved'] ) ) {
return $commentdata['comment_approved']; return $commentdata['comment_approved'];
} }
@ -2415,7 +2419,7 @@ function wp_set_comment_status( $comment_id, $comment_status, $wp_error = false
* *
* @since 2.0.0 * @since 2.0.0
* @since 4.9.0 Add updating comment meta during comment update. * @since 4.9.0 Add updating comment meta during comment update.
* @since 5.5.0 Allow returning a WP_Error object on failure. * @since 5.5.0 The `$wp_error` parameter was added.
* *
* @global wpdb $wpdb WordPress database abstraction object. * @global wpdb $wpdb WordPress database abstraction object.
* *
@ -2488,7 +2492,7 @@ function wp_update_comment( $commentarr, $wp_error = false ) {
* WP_Error object is preventing the comment to be updated. * WP_Error object is preventing the comment to be updated.
* *
* @since 4.7.0 * @since 4.7.0
* @since 5.5.0 Allow returning a WP_Error object on failure. * @since 5.5.0 The `$wp_error` parameter was added.
* *
* @param array $data The new, processed comment data. * @param array $data The new, processed comment data.
* @param array $comment The old, unslashed comment data. * @param array $comment The old, unslashed comment data.

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.5-alpha-48207'; $wp_version = '5.5-alpha-48208';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.