Changeset 6610

Timestamp:

12/10/2012 03:02:27 PM (12 years ago)

Author:

johnjamesjacoby

Message:

Allow profile field visibility to work when viewing register page. Fixes #4456.

File:

• trunk/bp-xprofile/bp-xprofile-classes.php (modified) (7 diffs)

trunk/bp-xprofile/bp-xprofile-classes.php

@@ -116 +116 @@
 
         $defaults = array(
-            '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,
+            '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,
             'fetch_visibility_level' => false,
-            'exclude_groups'      => false,
-            'exclude_fields'      => false
+            'exclude_groups'         => false,
+            'exclude_fields'         => false
         );
 
@@ -176 +176 @@
             return $groups;
 
-        if ( ! empty( $fetch_field_data ) && ! empty( $user_id ) ) {
+        if ( ! empty( $fetch_field_data ) ) {
 
             // Fetch the field data for the user.
@@ -185 +185 @@
             $field_ids_sql = implode( ',', (array) $field_ids );
 
-            if ( !empty( $field_ids ) )
+            if ( ! empty( $field_ids ) && ! empty( $user_id ) ) {
                 $field_data = $wpdb->get_results( $wpdb->prepare( "SELECT id, 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
@@ -233 +234 @@
             }
 
-            if ( $fetch_visibility_level ) {
+            if ( !empty( $fetch_visibility_level ) ) {
                 $fields = self::fetch_visibility_level( $user_id, $fields );
             }
@@ -294 +295 @@
      * @return array $fields The database results, with field_visibility added
      */
-    function fetch_visibility_level( $user_id, $fields ) {
+    function fetch_visibility_level( $user_id = 0, $fields = array() ) {
 
         // Get the user's visibility level preferences
@@ -302 +303 @@
         $admin_set_levels  = self::fetch_default_visibility_levels();
 
-        foreach( (array)$fields as $key => $field ) {
+        foreach( (array) $fields as $key => $field ) {
+
             // Does the admin allow this field to be customized?
             $allow_custom = empty( $admin_set_levels[$field->id]['allow_custom'] ) || 'allowed' == $admin_set_levels[$field->id]['allow_custom'];
@@ -309 +311 @@
             if ( $allow_custom && isset( $visibility_levels[$field->id] ) ) {
                 $field_visibility = $visibility_levels[$field->id];
+
+            // If no admin-set default is saved, fall back on a global default
             } else {
-                // If no admin-set default is saved, fall back on a global default
                 $field_visibility = !empty( $admin_set_levels[$field->id]['default'] ) ? $admin_set_levels[$field->id]['default'] : apply_filters( 'bp_xprofile_default_visibility_level', 'public' );
             }