Changeset 2320 for trunk/bp-xprofile/bp-xprofile-templatetags.php

Timestamp:

01/17/2010 07:42:57 PM (16 years ago)

Author:

apeatling

Message:

Improved profile page performance.

File:

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

trunk/bp-xprofile/bp-xprofile-templatetags.php

@@ -20 +20 @@
 
     function bp_xprofile_data_template( $user_id, $profile_group_id ) {
-
-        if ( !$profile_group_id ) {
-            if ( !$this->groups = wp_cache_get( 'xprofile_groups', 'bp' ) ) {
-                $this->groups = BP_XProfile_Group::get_all(true);
-                wp_cache_set( 'xprofile_groups', $this->groups, 'bp' );
-            }
-        } else {
-            if ( !$this->groups = wp_cache_get( 'xprofile_group_' . $profile_group_id, 'bp' ) ) {
-                $this->groups = new BP_XProfile_Group( $profile_group_id );
-                wp_cache_set( 'xprofile_group_' . $profile_group_id, 'bp' );
-            }
-
-            /* We need to put this single group into the same format as multiple group (an array) */
-            $this->groups = array( $this->groups );
-        }
+        $this->groups = BP_XProfile_Group::get( array(
+            'profile_group_id' => $profile_group_id,
+            'user_id' => $user_id,
+            'hide_empty_groups' => true,
+            'fetch_fields' => true,
+            'fetch_field_data' => true
+        ) );
 
         $this->group_count = count($this->groups);
@@ -51 +43 @@
 
         $this->group = $this->groups[$this->current_group];
-
-        if ( !$fields = wp_cache_get( 'xprofile_fields_' . $this->group->id . '_' . $this->user_id, 'bp' ) ) {
-            for ( $i = 0; $i < count($this->group->fields); $i++ ) {
-                /* Don't try and fetch any existing profile data if we are using this loop on the registration page */
-                $get_data = ( !bp_is_register_page() ) ? true : false;
-
-                $field = new BP_XProfile_Field( $this->group->fields[$i]->id, $this->user_id, $get_data );
-                $fields[$i] = $field;
-            }
-
-            wp_cache_set( 'xprofile_fields_' . $this->group->id . '_' . $this->user_id, $fields, 'bp' );
-        }
-
-        $this->group->fields = apply_filters( 'xprofile_group_fields', $fields, $this->group->id );
+        $this->group->fields = apply_filters( 'xprofile_group_fields', $this->group->fields, $this->group->id );
         $this->field_count = count( $this->group->fields );
 
@@ -386 +365 @@
         $r = wp_parse_args( $args, $defaults );
         extract( $r, EXTR_SKIP );
+
+        if ( !method_exists( $field, 'get_children' ) )
+            $field = new BP_XProfile_Field( $field->id );
 
         $options = $field->get_children();
@@ -584 +566 @@
 
     if ( !$groups = wp_cache_get( 'xprofile_groups_inc_empty', 'bp' ) ) {
-        $groups = BP_XProfile_Group::get_all();
+        $groups = BP_XProfile_Group::get( array( 'fetch_fields' => true ) );
         wp_cache_set( 'xprofile_groups_inc_empty', $groups, 'bp' );
     }