Changeset 4869 for trunk/bp-xprofile/bp-xprofile-template.php

Timestamp:

07/26/2011 05:26:30 PM (14 years ago)

Author:

boonebgorges

Message:

Adds hide_empty_fields parameter to bp_has_profile() and the rest of the profile template chain, to make zebra striping easier in the profile component. Fixes #3074. Props johnjamesjacoby for help with the patch

File:

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

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

@@ -21 +21 @@
     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 __construct( $user_id, $profile_group_id, $hide_empty_groups = false, $fetch_fields = false, $fetch_field_data = false, $exclude_groups = false, $exclude_fields = false ) {
+    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, $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,
@@ -153 +154 @@
     global $bp, $profile_template;
 
+    // Only show empty fields if we're on the Dashboard, or on a user's profile edit page
+    $hide_empty_fields = ( !is_network_admin() && !is_admin() && !bp_is_user_profile_edit() );
+
     $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,
@@ -166 +171 @@
     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 );
 }
@@ -190 +195 @@
     function bp_get_field_css_class( $class = false ) {
         global $profile_template;
-
+        
         $css_classes = array();