Changeset 5779
- Timestamp:
- 02/13/2012 08:48:57 PM (13 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/bp-core/admin/bp-core-schema.php
r5749 r5779 243 243 $bp_prefix = bp_core_get_table_prefix(); 244 244 245 bp_update_option( 'bp-xprofile-base-group-name', _x( 'Base', 'First XProfile group name', 'buddypress' ) ); 246 bp_update_option( 'bp-xprofile-fullname-field-name', _x( 'Name', 'XProfile fullname field name', 'buddypress' ) ); 245 // These values should only be updated if they are not already present 246 if ( !$base_group_name = bp_get_option( 'bp-xprofile-base-group-name' ) ) { 247 bp_update_option( 'bp-xprofile-base-group-name', _x( 'Base', 'First XProfile group name', 'buddypress' ) ); 248 } 249 250 if ( !$fullname_field_name = bp_get_option( 'bp-xprofile-fullname-field-name' ) ) { 251 bp_update_option( 'bp-xprofile-fullname-field-name', _x( 'Name', 'XProfile fullname field name', 'buddypress' ) ); 252 } 247 253 248 254 $sql[] = "CREATE TABLE {$bp_prefix}bp_xprofile_groups ( -
trunk/bp-members/bp-members-functions.php
r5729 r5779 407 407 if ( !$fullname = wp_cache_get( 'bp_user_fullname_' . $user_id, 'bp' ) ) { 408 408 if ( bp_is_active( 'xprofile' ) ) { 409 $fullname = xprofile_get_field_data( stripslashes( $bp->site_options['bp-xprofile-fullname-field-name'] ), $user_id );409 $fullname = xprofile_get_field_data( 1, $user_id ); 410 410 411 411 if ( empty($fullname) ) {
Note: See TracChangeset
for help on using the changeset viewer.