Changeset 7915 for trunk/bp-xprofile/bp-xprofile-classes.php

Timestamp:

02/17/2014 07:54:32 PM (11 years ago)

Author:

boonebgorges

Message:

Don't use fetch_default_visibility_levels() method in bp_has_profile() loop

There's no need to do this custom pre-fetching of visibility levels within
the bp_has_profile() loop, because the values are already loaded into the cache
by bp_xprofile_update_meta_cache(). So we use bp_xprofile_get_meta() instead.

See #5398

File:

• trunk/bp-xprofile/bp-xprofile-classes.php (modified) (4 diffs)

trunk/bp-xprofile/bp-xprofile-classes.php

@@ -266 +266 @@
         }
 
+        // Prime the meta cache, if necessary
+        if ( $update_meta_cache ) {
+            bp_xprofile_update_meta_cache( $object_ids );
+        }
+
         // Maybe fetch visibility levels
         if ( !empty( $fetch_visibility_level ) ) {
@@ -292 +297 @@
             // Reset indexes
             $groups = array_values( $groups );
-        }
-
-        // Prime the meta cache, if necessary
-        if ( $update_meta_cache ) {
-            bp_xprofile_update_meta_cache( $object_ids );
         }
 
@@ -394 +394 @@
         $visibility_levels = bp_get_user_meta( $user_id, 'bp_xprofile_visibility_levels', true );
 
-        // Get the admin-set preferences
-        $admin_set_levels  = self::fetch_default_visibility_levels();
-
         foreach( (array) $fields as $key => $field ) {
 
             // Does the admin allow this field to be customized?
-            $allow_custom = empty( $admin_set_levels[$field->id]['allow_custom'] ) || 'allowed' == $admin_set_levels[$field->id]['allow_custom'];
+            $allow_custom = 'disabled' !== bp_xprofile_get_meta( $field->id, 'field', 'allow_custom_visibility' );
 
             // Look to see if the user has set the visibility for this field
@@ -408 +405 @@
             // If no admin-set default is saved, fall back on a global default
             } else {
-                $field_visibility = !empty( $admin_set_levels[$field->id]['default'] ) ? $admin_set_levels[$field->id]['default'] : apply_filters( 'bp_xprofile_default_visibility_level', 'public' );
+                $fallback_visibility = bp_xprofile_get_meta( $field->id, 'field', 'default_visibility' );
+                $field_visibility = ! empty( $fallback_visibility ) ? $fallback_visibility : apply_filters( 'bp_xprofile_default_visibility_level', 'public' );
             }