Changeset 10200

Timestamp:

10/07/2015 03:08:00 PM (11 years ago)

Author:

boonebgorges

Message:

Use xprofile_get_field() throughout bp-xprofile.

It's properly cached after [10198], so let's use it.

See #6638.

Location:

trunk/src/bp-xprofile

Files:

• bp-xprofile-admin.php (modified) (3 diffs)
• bp-xprofile-filters.php (modified) (1 diff)
• bp-xprofile-functions.php (modified) (3 diffs)
• bp-xprofile-template.php (modified) (1 diff)

trunk/src/bp-xprofile/bp-xprofile-admin.php

@@ -180 +180 @@
 
                                                                         // Load the field.
-                                                                        $field = new BP_XProfile_Field( $field->id );
+                                                                        $field = xprofile_get_field( $field->id );
 
                                                                         $class = '';
@@ -330 +330 @@
         $bp = buddypress();
 
-        $field           = new BP_XProfile_Field( $field_id );
+        $field           = xprofile_get_field( $field_id );
         $field->group_id = $group_id;
 
@@ -439 +439 @@
         // @todo trust this param.
         $field_type  = ( 'field' == $field_type ) ? __( 'field', 'buddypress' ) : __( 'option', 'buddypress' );
-        $field       = new BP_XProfile_Field( $field_id );
+        $field       = xprofile_get_field( $field_id );
 
         if ( !$field->delete( (bool) $delete_data ) ) {

trunk/src/bp-xprofile/bp-xprofile-filters.php

@@ -252 +252 @@
  */
 function xprofile_filter_format_field_value_by_field_id( $field_value, $field_id ) {
-        $field = new BP_XProfile_Field( $field_id );
+        $field = xprofile_get_field( $field_id );
         return xprofile_filter_format_field_value_by_type( $field_value, $field->type );
 }

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

@@ -251 +251 @@
         // Instantiate a new field object.
         if ( ! empty( $r['field_id'] ) ) {
-                $field = new BP_XProfile_Field( $r['field_id'] );
+                $field = xprofile_get_field( $r['field_id'] );
         } else {
                 $field = new BP_XProfile_Field;
@@ -394 +394 @@
         }
 
-        $field          = new BP_XProfile_Field( $field_id );
+        $field          = xprofile_get_field( $field_id );
         $field_type     = BP_XProfile_Field::get_type( $field_id );
         $field_type_obj = bp_xprofile_create_field_type( $field_type );
@@ -505 +505 @@
 
         // Use the user's stored level, unless custom visibility is disabled.
-        $field = new BP_XProfile_Field( $field_id );
+        $field = xprofile_get_field( $field_id );
         if ( isset( $field->allow_custom_visibility ) && 'disabled' === $field->allow_custom_visibility ) {
                 $current_level = $field->default_visibility;

trunk/src/bp-xprofile/bp-xprofile-template.php

@@ -811 +811 @@
                  */
                 if ( ! method_exists( $field, 'get_children' ) ) {
-                        $field_obj = new BP_XProfile_Field( $field->id );
+                        $field_obj = xprofile_get_field( $field->id );
 
                         foreach ( $field as $field_prop => $field_prop_value ) {