Changeset 5778

Timestamp:

02/13/2012 08:45:48 PM (13 years ago)

Author:

boonebgorges

Message:

Use field_id 1 when checking for existing fullname in bp_core_get_user_displayname() fallback, to avoid mismatches in bp-xprofile-fullname-field-name site option.
Don't overwrite bp-xprofile-fullname-field-name and bp-xprofile-base-group-name during upgrade if they're already populated.
Fixes #3725

Location:

branches/1.5

Files:

• bp-core/admin/bp-core-schema.php (modified) (1 diff)
• bp-members/bp-members-functions.php (modified) (1 diff)

branches/1.5/bp-core/admin/bp-core-schema.php

@@ -206 +206 @@
     $bp_prefix = bp_core_get_table_prefix();
 
-    bp_update_option( 'bp-xprofile-base-group-name', _x( 'Base', 'First XProfile group name', 'buddypress' ) );
-    bp_update_option( 'bp-xprofile-fullname-field-name', _x( 'Name', 'XProfile fullname field name', 'buddypress' ) );
+    // These values should only be updated if they are not already present
+    if ( !$base_group_name = bp_get_option( 'bp-xprofile-base-group-name' ) ) {
+        bp_update_option( 'bp-xprofile-base-group-name', _x( 'Base', 'First XProfile group name', 'buddypress' ) );
+    }
+
+    if ( !$fullname_field_name = bp_get_option( 'bp-xprofile-fullname-field-name' ) ) {
+        bp_update_option( 'bp-xprofile-fullname-field-name', _x( 'Name', 'XProfile fullname field name', 'buddypress' ) );
+    }
 
     $sql[] = "CREATE TABLE {$bp_prefix}bp_xprofile_groups (

branches/1.5/bp-members/bp-members-functions.php

@@ -408 +408 @@
     if ( !$fullname = wp_cache_get( 'bp_user_fullname_' . $user_id, 'bp' ) ) {
         if ( bp_is_active( 'xprofile' ) ) {
-            $fullname = xprofile_get_field_data( stripslashes( $bp->site_options['bp-xprofile-fullname-field-name'] ), $user_id );
+            $fullname = xprofile_get_field_data( 1, $user_id );
 
             if ( empty($fullname) ) {