Ticket #6552: 6552.patch

src/bp-xprofile/classes/class-bp-xprofile-field.php

@@ -282 +282 @@
                 }
 
                 /**
-                 * Check for null so field options can be changed without changing any
+                 * Check for false so field options can be changed without changing any
                  * other part of the field. The described situation will return 0 here.
                  */
-                if ( $wpdb->query( $sql ) !== null ) {
+                if ( $wpdb->query( $sql ) !== false ) {
 
                         if ( !empty( $this->id ) ) {
                                 $field_id = $this->id;

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

@@ -140 +140 @@
                 // Attempt to insert or update
                 $query = $wpdb->query( $sql );
 
-                // Bail if query fails
-                if ( empty( $query ) || is_wp_error( $query ) ) {
+                /**
+                 * Check for false so field options can be changed without changing any
+                 * other part of the field. The described situation will return 0 here.
+                 */
+                if ( $query === false ) {
                         return false;
                 }