Changeset 10002

Timestamp:

07/09/2015 12:28:55 AM (11 years ago)

Author:

boonebgorges

Message:

BP_XProfile_Group::save() should not return false when a save is successful but no rows are updated.

It ought to be semantically possible to save a fieldgroup without making any
changes to the group. Otherwise the return values of the save() method are
inconsistent, and the 'xprofile_group_after_save' hook is not fired reliably.

Props Offereins.
Fixes #6552.

Location:

trunk

Files:

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

trunk/src/bp-xprofile/classes/class-bp-xprofile-group.php

@@ -141 +141 @@
                 $query = $wpdb->query( $sql );
 
-                // Bail if query fails
-                if ( empty( $query ) || is_wp_error( $query ) ) {
+                // Bail if query fails. If `$query` is 0, it means the save was successful, but no fields were updated.
+                if ( false === $query || is_wp_error( $query ) ) {
                         return false;
                 }

trunk/tests/phpunit/testcases/xprofile/class-bp-xprofile-group.php

@@ -6 +6 @@
  */
 class BP_Tests_BP_XProfile_Group extends BP_UnitTestCase {
+
+        /**
+         * @ticket BP6552
+         */
+        public function test_save_should_not_return_false_when_no_fields_have_been_altered() {
+                $g = $this->factory->xprofile_group->create();
+                $group = new BP_XProfile_Group( $g );
+
+                $saved = $group->save();
+
+                $this->assertEquals( $g, $saved );
+        }
+
         /**
          * @group fetch_visibility_level