- remove looping in case if set 'display_name' as custom fields for display name setting;

This commit is contained in:
nikitozzzzzzz
2018-10-31 11:03:36 +02:00
parent a75be3b0be
commit 6f96192605
2 changed files with 6 additions and 6 deletions
+2 -1
View File
@@ -363,12 +363,13 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) {
$args = wp_parse_args( $args, $defaults );
$args['lock_text'] = $this->convert_locker_tags( $args['lock_text'] );
if ( ! is_user_logged_in() ) {
if ( $args['show_lock'] == 'no' ) {
echo '';
} else {
$args['lock_text'] = $this->convert_locker_tags( $args['lock_text'] );
$this->set_args = $args;
$this->load_template( 'login-to-view' );
}
+4 -5
View File
@@ -2179,17 +2179,16 @@ function um_user( $data, $attrs = null ) {
}
if ($op == 'field' && UM()->options()->get( 'display_name_field' ) != '') {
if ( $op == 'field' && UM()->options()->get( 'display_name_field' ) != '' ) {
$fields = array_filter( preg_split( '/[,\s]+/', UM()->options()->get( 'display_name_field' ) ) );
$name = '';
foreach ($fields as $field) {
if (um_profile( $field )) {
foreach ( $fields as $field ) {
if ( um_profile( $field ) ) {
$name .= um_profile( $field ) . ' ';
} else if (um_user( $field )) {
} elseif ( um_user( $field ) && $field != 'display_name' ) {
$name .= um_user( $field ) . ' ';
}
}
}