Changeset 9366

Timestamp:

01/16/2015 10:02:01 AM (9 years ago)

Author:

djpaul

Message:

Activity: make sure activity actions are set when creating activity objects.

We can't assume it will already be set because this is normally only done on an ad-hoc basis.
Running certain unit tests in isolation revealed this issue.

Fixes #6126, props imath

Location:

trunk

Files:

• src/bp-activity/bp-activity-classes.php (modified) (1 diff)
• tests/phpunit/testcases/blogs/activity.php (modified) (1 diff)

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

@@ -162 +162 @@
             $this->is_spam           = $row->is_spam;
         }
+
+        /**
+         * Make sure the activity actions have been registered.
+         * We can't assume it will already be set because this is normally only done on an ad-hoc basis.
+         *
+         * @link https://buddypress.trac.wordpress.org/ticket/6126
+         */
+        bp_activity_get_actions();
 
         // Generate dynamic 'action' when possible

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

@@ -284 +284 @@
         $this->assertEquals( $this->comment_post_id, $p );
     }
+
+    /**
+     * @ticket BP6126
+     */
+    public function test_check_activity_actions_are_set_when_creating_activity_object() {
+        $bp = buddypress();
+
+        if ( isset( $bp->activity->actions ) ) {
+            unset( $bp->activity->actions );
+        }
+
+        $u = $this->factory->user->create();
+        $p = $this->factory->post->create( array( 'post_author' => $u, ) );
+        $a = $this->factory->activity->create( array(
+            'component'         => buddypress()->blogs->id,
+            'item_id'           => 1,
+            'secondary_item_id' => $p,
+            'type'              => 'new_blog_post',
+            'user_id'           => $u,
+        ) );
+
+        $a_obj = new BP_Activity_Activity( $a );
+        $this->assertTrue( ! empty( $a_obj->action ) );
+
+    }
+
     /**
      * Dopey passthrough method so we can check that the correct values