Changeset 48218 for trunk/src/wp-includes/comment.php

Timestamp:

06/29/2020 11:40:56 PM (4 years ago)

Author:

SergeyBiryukov

Message:

Comments: Make wp_update_comment() return a WP_Error object for a canceled update, if $wp_error parameter is true.

Remove redundant checks for wp_update_comment() results being false, as the function always returns a WP_Error object now if $wp_error is true.

Follow-up to [48154], [48215], [48216].

See #39732.

File:

• trunk/src/wp-includes/comment.php (modified) (1 diff)

trunk/src/wp-includes/comment.php

@@ -2504 +2504 @@
     $data = apply_filters( 'wp_update_comment_data', $data, $comment, $commentarr, $wp_error );
 
+    if ( ! $data ) {
+        $data = new WP_Error( 'comment_update_canceled', __( 'Comment update canceled.' ) );
+    }
+
     // Do not carry on on failure.
-    if ( is_wp_error( $data ) || ! $data ) {
-        return $data;
+    if ( is_wp_error( $data ) ) {
+        if ( $wp_error ) {
+            return $data;
+        } else {
+            return false;
+        }
     }