Changeset 8177

Timestamp:

03/27/2014 07:29:08 PM (12 years ago)

Author:

boonebgorges

Message:

Bail from bp_activity_remove_user_favorite() if the user has not previously favorited the item in question

The failure to do this check could result in the incorrect decrementing of the
item's favorite_count.

Fixes #5478

Location:

trunk

Files:

• bp-activity/bp-activity-functions.php (modified) (1 diff)
• tests/testcases/activity/functions.php (modified) (1 diff)

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

@@ -471 +471 @@
                 $user_id = bp_loggedin_user_id();
 
-        // Remove the fav from the user's favs
         $my_favs = bp_get_user_meta( $user_id, 'bp_favorite_activities', true );
         $my_favs = array_flip( (array) $my_favs );
+
+        // Bail if the user has not previously favorited the item
+        if ( ! isset( $my_favs[ $activity_id ] ) ) {
+                return false;
+        }
+
+        // Remove the fav from the user's favs
         unset( $my_favs[$activity_id] );
         $my_favs = array_unique( array_flip( $my_favs ) );

trunk/tests/testcases/activity/functions.php

@@ -711 +711 @@
         }
 
+        /**
+         * @group favorites
+         * @group bp_activity_remove_user_favorite
+         */
+        public function test_remove_user_favorite_bad_activity_id() {
+                $u1 = $this->create_user();
+                $u2 = $this->create_user();
+                $a = $this->factory->activity->create();
+
+                // Only favorite for user 1
+                bp_activity_add_user_favorite( $a, $u1 );
+
+                // Removing for user 2 should fail
+                $this->assertFalse( bp_activity_remove_user_favorite( $a, $u2 ) );
+                $this->assertEquals( 1, bp_activity_get_meta( $a, 'favorite_count' ) );
+        }
+
         public function check_activity_caches() {
                 foreach ( $this->acaches as $k => $v ) {