Changeset 11312

Timestamp:

12/20/2016 02:54:45 AM (8 years ago)

Author:

boonebgorges

Message:

Activity: After populate(), activity items with a bad ID should have id = 0.

Props jdgrimes.
Fixes #7394.

Location:

trunk

Files:

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

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

@@ -186 +186 @@
         }
 
-        if ( ! empty( $row ) ) {
-            $this->id                = (int) $row->id;
-            $this->item_id           = (int) $row->item_id;
-            $this->secondary_item_id = (int) $row->secondary_item_id;
-            $this->user_id           = (int) $row->user_id;
-            $this->primary_link      = $row->primary_link;
-            $this->component         = $row->component;
-            $this->type              = $row->type;
-            $this->action            = $row->action;
-            $this->content           = $row->content;
-            $this->date_recorded     = $row->date_recorded;
-            $this->hide_sitewide     = (int) $row->hide_sitewide;
-            $this->mptt_left         = (int) $row->mptt_left;
-            $this->mptt_right        = (int) $row->mptt_right;
-            $this->is_spam           = (int) $row->is_spam;
-        }
+        if ( empty( $row ) ) {
+            $this->id = 0;
+            return;
+        }
+
+        $this->id                = (int) $row->id;
+        $this->item_id           = (int) $row->item_id;
+        $this->secondary_item_id = (int) $row->secondary_item_id;
+        $this->user_id           = (int) $row->user_id;
+        $this->primary_link      = $row->primary_link;
+        $this->component         = $row->component;
+        $this->type              = $row->type;
+        $this->action            = $row->action;
+        $this->content           = $row->content;
+        $this->date_recorded     = $row->date_recorded;
+        $this->hide_sitewide     = (int) $row->hide_sitewide;
+        $this->mptt_left         = (int) $row->mptt_left;
+        $this->mptt_right        = (int) $row->mptt_right;
+        $this->is_spam           = (int) $row->is_spam;
 
         // Generate dynamic 'action' when possible.

trunk/tests/phpunit/testcases/activity/class.BP_Activity_Activity.php

@@ -772 +772 @@
     }
 
+    /**
+     * @ticket BP7394
+     */
+    public function test_nonexistent_activity_should_have_id_0_after_population() {
+        $a = $this->factory->activity->create();
+        bp_activity_delete_by_activity_id( $a );
+
+        $a_obj = new BP_Activity_Activity( $a );
+        $this->assertSame( 0, $a_obj->id );
+    }
+
     public function action_cb( $activity ) {
         return 'Woo Hoo!';