Changeset 9676 for trunk/src/bp-xprofile/bp-xprofile-template.php

Timestamp:

04/01/2015 11:14:16 PM (10 years ago)

Author:

johnjamesjacoby

Message:

XProfile: Introduce bp_xprofile_groups cache group, to replace bp cache group usage.

• Reduces field group cache keys down to just their ID, using a unique cache group
• Use all key instead of 'xprofile_groups_inc_empty`
• Use default_visibility_levels key instead of xprofile_default_visibility_levels

See #6341, #5733.

File:

• trunk/src/bp-xprofile/bp-xprofile-template.php (modified) (2 diffs)

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

@@ -881 +881 @@
  */
 function bp_profile_get_field_groups() {
-    $groups = wp_cache_get( 'xprofile_groups_inc_empty', 'bp' );
-
-    if ( empty( $groups ) ) {
+
+    $groups = wp_cache_get( 'all', 'bp_xprofile_groups' );
+    if ( false === $groups ) {
         $groups = bp_xprofile_get_groups( array( 'fetch_fields' => true ) );
-        wp_cache_set( 'xprofile_groups_inc_empty', $groups, 'bp' );
+        wp_cache_set( 'all', $groups, 'bp_xprofile' );
     }
 
@@ -974 +974 @@
 }
     function bp_get_profile_group_name() {
-        if ( !$group_id = bp_action_variable( 1 ) )
+
+        // Check action variable
+        $group_id = bp_action_variable( 1 );
+        if ( empty( $group_id ) || ! is_numeric( $group_id ) ) {
             $group_id = 1;
-
-        if ( !is_numeric( $group_id ) )
-            $group_id = 1;
-
-        if ( !$group = wp_cache_get( 'xprofile_group_' . $group_id, 'bp' ) ) {
-            $group = new BP_XProfile_Group($group_id);
-            wp_cache_set( 'xprofile_group_' . $group_id, $group, 'bp' );
-        }
+        }
+
+        // Check for cached group
+        $group = new BP_XProfile_Group( $group_id );
 
         /**