Changeset 12768

Timestamp:

10/26/2020 02:11:53 PM (4 years ago)

Author:

boonebgorges

Message:

Declare $get_data = false when calling xprofile_get_field().

The default value of $get_data is true, which means that when calling
xprofile_get_field() with no explicit $user_id, but with a logged-in user,
BP_XProfile_Field::populate() will attempt to fetch the user's data. This
is usually neither intended nor needed, and results in unnecessary database
overhead.

See #8378.

Location:

trunk/src

Files:

• bp-members/bp-members-functions.php (modified) (1 diff)
• bp-members/classes/class-bp-signup.php (modified) (1 diff)
• bp-xprofile/bp-xprofile-admin.php (modified) (4 diffs)
• bp-xprofile/bp-xprofile-caps.php (modified) (1 diff)
• bp-xprofile/bp-xprofile-filters.php (modified) (1 diff)
• bp-xprofile/bp-xprofile-functions.php (modified) (3 diffs)
• bp-xprofile/bp-xprofile-template.php (modified) (1 diff)

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

@@ -2132 +2132 @@
                     $visibility_level = $user['meta'][ $key ];
                 } else {
-                    $vfield           = xprofile_get_field( $field_id );
+                    $vfield           = xprofile_get_field( $field_id, null, false );
                     $visibility_level = isset( $vfield->default_visibility ) ? $vfield->default_visibility : 'public';
                 }

trunk/src/bp-members/classes/class-bp-signup.php

@@ -413 +413 @@
                         $visibility_level = $usermeta[ $key ];
                     } else {
-                        $vfield           = xprofile_get_field( $field_id );
+                        $vfield           = xprofile_get_field( $field_id, null, false );
                         $visibility_level = isset( $vfield->default_visibility ) ? $vfield->default_visibility : 'public';
                     }

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

@@ -272 +272 @@
 
                                     // Load the field.
-                                    $field = xprofile_get_field( $field->id );
+                                    $field = xprofile_get_field( $field->id, null, false );
 
                                     $class = '';
@@ -479 +479 @@
         $field = new BP_XProfile_Field();
     } else {
-        $field = xprofile_get_field( $field_id );
+        $field = xprofile_get_field( $field_id, null, false );
     }
 
@@ -616 +616 @@
     // Handle the deletion of field
     } else {
-        $field = xprofile_get_field( $field_id );
+        $field = xprofile_get_field( $field_id, null, false );
 
         if ( !$field->delete( (bool) $delete_data ) ) {
@@ -651 +651 @@
     }
 
-    $field = xprofile_get_field( $field_id );
+    $field = xprofile_get_field( $field_id, null, false );
 
     $base_url = remove_query_arg( array( 'mode', 'field_id', 'bp_xprofile_delete_field' ), $_SERVER['REQUEST_URI'] ); ?>

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

@@ -86 +86 @@
     if ( 'bp_xprofile_change_field_visibility' === $capability && 0 === $user_id ) {
         $field_id = bp_get_the_profile_field_id();
-        if ( $field_id && $field = xprofile_get_field( $field_id ) ) {
+        if ( $field_id && $field = xprofile_get_field( $field_id, null, false ) ) {
             $user_can = 'allowed' === $field->allow_custom_visibility;
         }

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

@@ -311 +311 @@
  */
 function xprofile_filter_format_field_value_by_field_id( $field_value, $field_id ) {
-    $field = xprofile_get_field( $field_id );
+    $field = xprofile_get_field( $field_id, null, false );
     return xprofile_filter_format_field_value_by_type( $field_value, $field->type, $field_id );
 }

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

@@ -255 +255 @@
     // Instantiate a new field object.
     if ( ! empty( $r['field_id'] ) ) {
-        $field = xprofile_get_field( $r['field_id'] );
+        $field = xprofile_get_field( $r['field_id'], null, false );
     } else {
         $field = new BP_XProfile_Field;
@@ -526 +526 @@
 
     // Use the user's stored level, unless custom visibility is disabled.
-    $field = xprofile_get_field( $field_id );
+    $field = xprofile_get_field( $field_id, null, false );
     if ( isset( $field->allow_custom_visibility ) && 'disabled' === $field->allow_custom_visibility ) {
         $current_level = $field->default_visibility;
@@ -1100 +1100 @@
     }
 
-    $field = xprofile_get_field( $field_id );
+    $field = xprofile_get_field( $field_id, null, false );
 
     $enabled = false;

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

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