10h30/ultimatemember
1
0
Fork 0
mirror of https://github.com/10h30/ultimatemember.git synced 2026-07-11 18:56:10 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/fix/helpscout#28332_fix_select_valuer_0'

Browse Source
This commit is contained in:
nikitasinelnikov
2019-03-01 16:47:41 +02:00
parent 3489a79bf1 a0a3234148
commit 0c04d87991
3 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/core/class-fields.php
+7 -1
View File
@@ -843,6 +843,9 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
if ( ! isset( UM()->form()->post_form[ $key ] ) ) {
$field_value = um_user( $key );
if( isset($field_value) && !$field_value ){
$field_value = 0;
}
if ( $key == 'role' ) {
@@ -905,8 +908,11 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
if ( $field_value && $this->editing == true && is_array( $field_value ) && ( in_array( $value, $field_value ) || in_array( html_entity_decode( $value ), $field_value ) ) ) {
return true;
}
if ( $field_value == 0 && $this->editing == true && ! is_array( $field_value ) && $field_value == $value ) {
return true;
}
if ( $field_value && $this->editing == true && ! is_array( $field_value ) && $field_value == $value ) {
echo $field_value;
return true;
}
includes/core/class-user.php
+5 -1
View File
@@ -1672,7 +1672,11 @@ if ( ! class_exists( 'um\core\User' ) ) {
foreach ( $changes as $key => $value ) {
if ( ! in_array( $key, $this->update_user_keys ) ) {
update_user_meta( $this->id, $key, $value );
if( $value === 0 ){
update_user_meta( $this->id, $key, '0' );
} else {
update_user_meta( $this->id, $key, $value );
}
} else {
$args[ $key ] = esc_attr( $changes[ $key ] );
}
includes/core/um-actions-profile.php
+3 -2
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( $array ) && isset( $array['editable'] ) && ! $array['editable'] ) {
@@ -229,6 +230,7 @@ function um_user_edit_profile( $args ) {
}
if ( isset( $args['submitted'][ $key ] ) ) {
if ( isset( $array['type'] ) && in_array( $array['type'], array( 'image', 'file' ) ) &&
( /*um_is_file_owner( UM()->uploader()->get_upload_base_url() . um_user( 'ID' ) . '/' . $args['submitted'][ $key ], um_user( 'ID' ) ) ||*/
um_is_temp_file( $args['submitted'][ $key ] ) || $args['submitted'][ $key ] == 'empty_file' ) ) {
@@ -236,14 +238,13 @@ function um_user_edit_profile( $args ) {
$files[ $key ] = $args['submitted'][ $key ];
} else {
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 ] ) {
} elseif ( $args['submitted'][ $key ] != '' ) {
$to_update[ $key ] = $args['submitted'][ $key ];
}
}