10h30/ultimatemember
1
0
Fork 0
mirror of https://github.com/10h30/ultimatemember.git synced 2026-06-05 15:09:37 +09:00
Code Issues Packages Projects Releases Wiki Activity

Display name issues

Browse Source
This commit is contained in:
Ultimate Member
2015-12-24 18:11:07 +02:00
parent 27aa2dcaf5
commit fdf7489925
5 changed files with 34 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/um-actions-save-profile.php
+1 -16
View File
@@ -9,18 +9,7 @@
if ( isset( $changes['first_name'] ) && isset( $changes['last_name'] ) ) {
if ( $changes['first_name'] && $changes['last_name'] && um_get_option('display_name') != 'public_name' ) {
wp_update_user( array( 'ID' => $ultimatemember->user->id, 'display_name' => $changes['first_name'] . ' ' . $changes['last_name'] ) );
$full_name = $changes['first_name'] . '.' . $changes['last_name'];
} else {
$full_name = $ultimatemember->user->profile['display_name'];
}
$full_name = $ultimatemember->user->profile['display_name'];
$full_name = $ultimatemember->validation->safe_name_in_url( $full_name );
/* duplicate or not */
@@ -58,9 +47,5 @@
}
if( um_get_option('display_name') === 'public_name' ){
update_user_meta( $ultimatemember->user->id, 'display_name', $changes['display_name'] );
}
}
core/um-builtin.php
+20 -10
View File
@@ -594,6 +594,26 @@ class UM_Builtin {
'editable' => 1,
),
'nickname' => array(
'title' => __('Nickname','ultimatemember'),
'metakey' => 'nickname',
'type' => 'text',
'label' => __('Nickname','ultimatemember'),
'required' => 0,
'public' => 1,
'editable' => 1,
),
'display_name' => array(
'title' => __('Display Name','ultimatemember'),
'metakey' => 'display_name',
'type' => 'text',
'label' => __('Display Name','ultimatemember'),
'required' => 0,
'public' => 1,
'editable' => 1,
),
'user_registered' => array(
'title' => __('Registration Date','ultimatemember'),
'metakey' => 'user_registered',
@@ -616,16 +636,6 @@ class UM_Builtin {
'edit_forbidden' => 1,
),
'display_name' => array(
'title' => __('Display Name','ultimatemember'),
'metakey' => 'display_name',
'type' => 'text',
'label' => __('Display Name','ultimatemember'),
'required' => 0,
'public' => 1,
'editable' => 1,
),
'user_email' => array(
'title' => __('E-mail Address','ultimatemember'),
'metakey' => 'user_email',
core/um-short-functions.php
+9 -5
View File
@@ -1168,6 +1168,14 @@ function um_user( $data, $attrs = null ) {
case 'display_name':
$op = um_get_option('display_name');
if ( $op == 'default' ) {
$name = um_profile('display_name');
}
if ( $op == 'nickname' ) {
$name = um_profile('nickname');
}
if ( $op == 'full_name' ) {
if ( um_user('first_name') && um_user('last_name') ) {
@@ -1214,11 +1222,7 @@ function um_user( $data, $attrs = null ) {
$name = um_profile( $data );
}
}
if ( $op == 'public_name' ) {
$name = um_profile( $data );
}
if ( $op == 'field' && um_get_option('display_name_field') != '' ) {
$fields = array_filter(preg_split('/[,\s]+/', um_get_option('display_name_field') ));
$name = '';
core/um-user.php
+1
View File
@@ -198,6 +198,7 @@ class UM_User {
// add user meta
foreach($this->usermeta as $k=>$v){
if ( $k == 'display_name') continue;
$this->profile[$k] = $v[0];
}
um-config.php
+3 -2
View File
@@ -122,15 +122,16 @@ $this->sections[] = array(
'select2' => array( 'allowClear' => 0, 'minimumResultsForSearch' => -1 ),
'title' => __( 'User Display Name','ultimatemember' ),
'desc' => __( 'This is the name that will be displayed for users on the front end of your site. Default setting uses first/last name as display name if it exists','ultimatemember' ),
'default' => 'full_name',
'default' => 'default',
'options' => array(
'default' => __('Default WP Display Name','ultimatemember'),
'nickname' => __('Nickname','ultimatemember'),
'username' => __('Username','ultimatemember'),
'full_name' => __('First name & last name','ultimatemember'),
'sur_name' => __('Last name & first name','ultimatemember'),
'initial_name' => __('First name & first initial of last name','ultimatemember'),
'initial_name_f' => __('First initial of first name & last name','ultimatemember'),
'first_name' => __('First name only','ultimatemember'),
'public_name' => __('Display name','ultimatemember'),
'field' => __('Custom field(s)','ultimatemember'),
),
'placeholder' => __('Select...')