Changeset 13128

Timestamp:

10/17/2021 12:03:45 PM (3 years ago)

Author:

imath

Message:

Into bp_activity_post_update() do return a WP Error when requested

Props oztaser

Fixes #8587

Location:

trunk

Files:

• src/bp-activity/bp-activity-functions.php (modified) (1 diff)
• tests/phpunit/testcases/activity/functions.php (modified) (2 diffs)

trunk/src/bp-activity/bp-activity-functions.php

@@ -2052 +2052 @@
 
     if ( empty( $r['content'] ) || ! strlen( trim( $r['content'] ) ) ) {
+        if ( 'wp_error' === $r['error_type'] ) {
+            return new WP_Error( 'bp_activity_missing_content', __( 'Please enter some content to post.', 'buddypress' ) );
+        }
+
         return false;
     }
 
     if ( bp_is_user_inactive( $r['user_id'] ) ) {
+        if ( 'wp_error' === $r['error_type'] ) {
+            return new WP_Error( 'bp_activity_inactive_user', __( 'User account has not yet been activated.', 'buddypress' ) );
+        }
+
         return false;
     }

trunk/tests/phpunit/testcases/activity/functions.php

@@ -1460 +1460 @@
      * @group bp_activity_post_update
      */
+    public function test_bp_activity_post_update_empty_content_wp_error() {
+        $activity = bp_activity_post_update( array(
+            'user_id'    => 3,
+            'error_type' => 'wp_error',
+        ) );
+
+        $this->assertInstanceOf( 'WP_Error', $activity );
+        $this->assertEquals( 'bp_activity_missing_content', $activity->get_error_code() );
+    }
+
+    /**
+     * @group bp_activity_post_update
+     */
     public function test_bp_activity_post_update_inactive_user() {
         $this->assertFalse( bp_activity_post_update( array(
@@ -1465 +1478 @@
             'content' => 'foo',
         ) ) );
+    }
+
+    /**
+     * @group bp_activity_post_update
+     */
+    public function test_bp_activity_post_update_inactive_user_wp_error() {
+        $activity = bp_activity_post_update( array(
+            'user_id'    => 3456,
+            'content'    => 'foo',
+            'error_type' => 'wp_error',
+        ) );
+
+        $this->assertInstanceOf( 'WP_Error', $activity );
+        $this->assertEquals( 'bp_activity_inactive_user', $activity->get_error_code() );
     }