Ticket #3074: 3074.03.patch

bp-xprofile/bp-xprofile-classes.php

@@ -113 +113 @@
                         'profile_group_id'  => false,
                         'user_id'           => $bp->displayed_user->id,
                         'hide_empty_groups' => false,
+                        'hide_empty_fields' => false,
                         'fetch_fields'      => false,
                         'fetch_field_data'  => false,
                         'exclude_groups'    => false,
@@ -161 +162 @@
                         foreach( (array)$fields as $field )
                                 $field_ids[] = $field->id;
 
-                        $field_ids = implode( ',', (array) $field_ids );
+                        $field_ids_sql = implode( ',', (array) $field_ids );
 
                         if ( !empty( $field_ids ) )
-                                $field_data = $wpdb->get_results( $wpdb->prepare( "SELECT field_id, value FROM {$bp->profile->table_name_data} WHERE field_id IN ( {$field_ids} ) AND user_id = %d", $user_id ) );
-
+                                $field_data = $wpdb->get_results( $wpdb->prepare( "SELECT field_id, value FROM {$bp->profile->table_name_data} WHERE field_id IN ( {$field_ids_sql} ) AND user_id = %d", $user_id ) );
+                                
+                        // Remove data-less fields, if necessary
+                        if ( $hide_empty_fields ) {
+                                // Loop through the results and find the fields that have data.
+                                foreach( (array)$field_data as $data ) {
+                                        if ( false !== $key = array_search( $data->field_id, $field_ids ) ) {
+                                                // Fields that have data get removed from the list
+                                                unset( $field_ids[$key] );
+                                        }
+                                }
+                                
+                                // The remaining members of $field_ids are empty. Remove them.
+                                foreach( $fields as $field_key => $field ) {
+                                        if ( in_array( $field->id, $field_ids ) ) {
+                                                unset( $fields[$field_key] );
+                                        }
+                                }
+                                
+                                // Reset the indexes
+                                $fields = array_values( $fields );
+                        }
+                        
                         if ( !empty( $field_data ) ) {
                                 foreach( (array)$fields as $field_key => $field ) {
                                         foreach( (array)$field_data as $data ) {
@@ -182 +204 @@
                                 if ( $group->id == $field->group_id )
                                         $groups[$group_key]->fields[] = $field;
                         }
+                        
+                        if ( empty( $group->fields ) ) {
+                                unset( $groups[$group_key] );
+                        }
+                        
+                        // Reset indexes
+                        $groups = array_values( $groups );
                 }
 
                 return $groups;

bp-xprofile/bp-xprofile-template.php

@@ -20 +20 @@
         var $in_the_loop;
         var $user_id;
 
-        function bp_xprofile_data_template( $user_id, $profile_group_id, $hide_empty_groups = false, $fetch_fields = false, $fetch_field_data = false, $exclude_groups = false, $exclude_fields = false ) {
-                $this->__construct( $user_id, $profile_group_id, $hide_empty_groups, $fetch_fields, $fetch_field_data, $exclude_groups, $exclude_fields );
+        function bp_xprofile_data_template( $user_id, $profile_group_id, $hide_empty_groups = false, $fetch_fields = false, $fetch_field_data = false, $exclude_groups = false, $exclude_fields = false, $hide_empty_fields = false ) {
+                $this->__construct( $user_id, $profile_group_id, $hide_empty_groups, $fetch_fields, $fetch_field_data, $exclude_groups, $exclude_fields, $hide_empty_fields );
         }
 
-        function __construct( $user_id, $profile_group_id, $hide_empty_groups = false, $fetch_fields = false, $fetch_field_data = false, $exclude_groups = false, $exclude_fields = false ) {
+        function __construct( $user_id, $profile_group_id, $hide_empty_groups = false, $fetch_fields = false, $fetch_field_data = false, $exclude_groups = false, $exclude_fields = false, $hide_empty_fields = false ) {
                 $this->groups = BP_XProfile_Group::get( array(
                         'profile_group_id'  => $profile_group_id,
                         'user_id'           => $user_id,
                         'hide_empty_groups' => $hide_empty_groups,
+                        'hide_empty_fields' => $hide_empty_fields,
                         'fetch_fields'      => $fetch_fields,
                         'fetch_field_data'  => $fetch_field_data,
                         'exclude_groups'    => $exclude_groups,
@@ -152 +153 @@
 function bp_has_profile( $args = '' ) {
         global $bp, $profile_template;
 
+        // Only show empty fields on the Dashboard or the user profile edit screen
+        if ( bp_is_user_profile_edit() || is_admin() || is_network_admin() )
+                $hide_empty_fields = false;
+        else
+                $hide_empty_fields = true;
+
         $defaults = array(
                 'user_id' => $bp->displayed_user->id,
                 'profile_group_id'  => false,
                 'hide_empty_groups' => true,
+                'hide_empty_fields' => $hide_empty_fields,
                 'fetch_fields'      => true,
                 'fetch_field_data'  => true,
                 'exclude_groups'    => false, // Comma-separated list of profile field group IDs to exclude
@@ -165 +173 @@
         $r = wp_parse_args( $args, $defaults );
         extract( $r, EXTR_SKIP );
 
-        $profile_template = new BP_XProfile_Data_Template( $user_id, $profile_group_id, $hide_empty_groups, $fetch_fields, $fetch_field_data, $exclude_groups, $exclude_fields );
+        $profile_template = new BP_XProfile_Data_Template( $user_id, $profile_group_id, $hide_empty_groups, $fetch_fields, $fetch_field_data, $exclude_groups, $exclude_fields, $hide_empty_fields );
         return apply_filters( 'bp_has_profile', $profile_template->has_groups(), $profile_template );
 }
 
@@ -189 +197 @@
 }
         function bp_get_field_css_class( $class = false ) {
                 global $profile_template;
-
+                
                 $css_classes = array();
 
                 if ( $class )