Merge branch 'master' into fix_privacy_tab_content

This commit is contained in:
Denis Baranov
2018-05-14 12:04:45 +03:00
2 changed files with 17 additions and 7 deletions
+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 {