Changeset 4958

Timestamp:

08/09/2011 07:32:28 PM (13 years ago)

Author:

djpaul

Message:

Correct handling of default value of the profile field loop's hide_empty_fields.
Also correct potential PHP warnings.
Fixes #3447

Location:

trunk

Files:

• bp-activity/bp-activity-classes.php (modified) (2 diffs)
• bp-xprofile/bp-xprofile-template.php (modified) (1 diff)

trunk/bp-activity/bp-activity-classes.php

@@ -255 +255 @@
         global $wpdb, $bp;
 
-        extract( $args );
-
         $defaults = array(
             'id'                => false,
@@ -270 +268 @@
             'hide_sitewide'     => false
         );
+        $params = wp_parse_args( $args, $defaults );
+        extract( $params );
 
         $where_args = false;

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

@@ -156 +156 @@
     // Only show empty fields if we're on the Dashboard, or we're on a user's profile edit page,
     // or this is a registration page
-    $hide_empty_fields = ( !is_network_admin() && !is_admin() && !bp_is_user_profile_edit() && !bp_is_register_page() );
+    $hide_empty_fields_default = ( !is_network_admin() && !is_admin() && !bp_is_user_profile_edit() && !bp_is_register_page() );
 
     $defaults = array(
-        'user_id' => $bp->displayed_user->id,
+        'user_id'           => $bp->displayed_user->id,
         'profile_group_id'  => false,
         'hide_empty_groups' => true,
-        'hide_empty_fields' => $hide_empty_fields,
+        'hide_empty_fields' => $hide_empty_fields_default,
         'fetch_fields'      => true,
         'fetch_field_data'  => true,