Changeset 9525

Timestamp:

02/22/2015 09:48:26 PM (12 years ago)

Author:

boonebgorges

Message:

Fix syntax typo in BP_Friends_Friendship::save().

An extraneous bracket was making it impossible to save an existing friendship
object.

Props sbrajesh.
Fixes #6247.

Location:

trunk

Files:

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

trunk/src/bp-friends/classes/class-bp-friends-friendship.php

@@ -161 +161 @@
                 // Update
                 if (!empty( $this->id ) ) {
-                        $result = $wpdb->query( $wpdb->prepare( "UPDATE {$bp->friends->table_name} SET initiator_user_id = %d, friend_user_id = %d, is_confirmed = %d, is_limited = %d, date_created = %s ) WHERE id = %d", $this->initiator_user_id, $this->friend_user_id, $this->is_confirmed, $this->is_limited, $this->date_created, $this->id ) );
+                        $result = $wpdb->query( $wpdb->prepare( "UPDATE {$bp->friends->table_name} SET initiator_user_id = %d, friend_user_id = %d, is_confirmed = %d, is_limited = %d, date_created = %s WHERE id = %d", $this->initiator_user_id, $this->friend_user_id, $this->is_confirmed, $this->is_limited, $this->date_created, $this->id ) );
 
                 // Save

trunk/tests/phpunit/testcases/friends/class-bp-friends-friendship.php

@@ -116 +116 @@
                 $this->assertEquals( 'is_friend', BP_Friends_Friendship::check_is_friend( $u1, $u2 ) );
         }
+
+        /**
+         * @group BP6247
+         */
+        public function test_save_method_should_update_existing_row() {
+                $u1 = $this->factory->user->create();
+                $u2 = $this->factory->user->create();
+
+                $friendship = new BP_Friends_Friendship();
+                $friendship->initiator_user_id = $u1;
+                $friendship->friend_user_id = $u2;
+                $friendship->is_confirmed = 0;
+                $friendship->is_limited = 0;
+                $friendship->date_created = bp_core_current_time();
+                $friendship->is_confirmed = 1;
+                $friendship->save();
+
+                $fid = $friendship->id;
+
+                $f = new BP_Friends_Friendship( $fid );
+                $f->is_confirmed = 1;
+                $f->save();
+
+                $f2 = new BP_Friends_Friendship( $fid );
+                $this->assertEquals( 1, $f2->is_confirmed );
+        }
 }