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

Merge branch 'master' into fix_privacy_tab_content

Browse Source
This commit is contained in:
Denis Baranov
2018-05-14 12:04:45 +03:00
parent 690a428a04 0ed407e0bc
commit 37ee0134a7
2 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/core/class-fields.php
+7 -3
View File
@@ -573,7 +573,8 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
} elseif ( um_user( $key ) && $this->editing == true ) {
if ( strstr( $key, 'user_pass' ) ) {
//show empty value for password fields
if ( strstr( $key, 'user_pass' ) || $type == 'password' ) {
return '';
}
@@ -3472,9 +3473,12 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
if (isset( $data['in_group'] ) && $data['in_group'] != '' && $rule != 'group') return;
if ($visibility == 'edit') return;
if ( $visibility == 'edit' ) return;
if (in_array( $type, array( 'block', 'shortcode', 'spacing', 'divider', 'group' ) )) {
//invisible on profile page
if ( $type == 'password' ) return;
if ( in_array( $type, array( 'block', 'shortcode', 'spacing', 'divider', 'group' ) ) ) {
} else {
includes/core/um-actions-profile.php
+10 -4
View File
@@ -218,6 +218,7 @@ function um_user_edit_profile( $args ) {
// loop through fields
if ( ! empty( $fields ) ) {
foreach ( $fields as $key => $array ) {
/*if ( ! um_can_edit_field( $fields[ $key ] ) )
@@ -239,10 +240,15 @@ function um_user_edit_profile( $args ) {
} else {
if ( isset( $userinfo[ $key ] ) && $args['submitted'][ $key ] != $userinfo[ $key ] ) {
$to_update[ $key ] = $args['submitted'][ $key ];
} elseif ( $args['submitted'][ $key ] ) {
$to_update[ $key ] = $args['submitted'][ $key ];
if ( $array['type'] == 'password' ) {
$to_update[ $key ] = wp_hash_password( $args['submitted'][ $key ] );
$args['submitted'][ $key ] = sprintf( __( 'Your choosed %s', 'ultimate-member' ), $array['title'] );
} else {
if ( isset( $userinfo[ $key ] ) && $args['submitted'][ $key ] != $userinfo[ $key ] ) {
$to_update[ $key ] = $args['submitted'][ $key ];
} elseif ( $args['submitted'][ $key ] ) {
$to_update[ $key ] = $args['submitted'][ $key ];
}
}
}