Ticket #7401: 7401.2.diff

src/bp-xprofile/bp-xprofile-functions.php

@@ -286 +286 @@
  * @param int|object $field ID of the field or object representing field data.
  * @return BP_XProfile_Field|null Field object if found, otherwise null.
  */
-function xprofile_get_field( $field ) {
+function xprofile_get_field( $field, $user_id = null, $get_data = true ) {
         if ( $field instanceof BP_XProfile_Field ) {
                 $_field = $field;
         } elseif ( is_object( $field ) ) {
                 $_field = new BP_XProfile_Field();
                 $_field->fill_data( $field );
         } else {
-                $_field = BP_XProfile_Field::get_instance( $field );
+                $_field = BP_XProfile_Field::get_instance( $field, $user_id, $get_data );
         }
 
         if ( ! $_field ) {

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

@@ -233 +233 @@
          * @param int $field_id ID of the field.
          * @return BP_XProfile_Field|false Field object if found, otherwise false.
          */
-        public static function get_instance( $field_id ) {
+        public static function get_instance( $field_id, $user_id = null, $get_data = true ) {
                 global $wpdb;
 
                 $field_id = (int) $field_id;
@@ -241 +241 @@
                         return false;
                 }
 
-                return new self( $field_id );
+                return new self( $field_id, $user_id, $get_data );
         }
 
         /**

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

@@ -396 +396 @@
                 // Pull field objects from the cache.
                 $fields = array();
                 foreach ( $field_ids as $field_id ) {
-                        $fields[] = xprofile_get_field( $field_id );
+                        $fields[] = xprofile_get_field( $field_id, null, false );
                 }
 
                 // Store field IDs for meta cache priming.
@@ -446 +446 @@
 
                                         // Loop through the data in each field.
                                         foreach( (array) $field_data as $data ) {
-
                                                 // Assign correct data value to the field.
                                                 if ( $field->id == $data->field_id ) {
                                                         $fields[ $field_key ]->data        = new stdClass;

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

@@ -489 +489 @@
                                         $d = new stdClass;
                                         $d->id           = '';
                                         $d->user_id      = $id;
-                                        $d->field_id     = '';
+                                        $d->field_id     = $field_id;
                                         $d->value        = '';
                                         $d->last_updated = '';
                                 }