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

- fixed conditional logic with not selected default radio button;

Browse Source
This commit is contained in:
nikitozzzzzzz
2017-09-11 17:03:16 +03:00
parent 495f447b5c
commit c79e76ad25
3 changed files with 75 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/admin/core/class-admin-upgrade.php
+12 -1
View File
@@ -64,10 +64,21 @@ if ( ! class_exists( 'Admin_Upgrade' ) ) {
}
closedir( $handle );
sort( $update_versions );
usort( $update_versions, array( &$this, 'version_compare_sort' ) );
$this->update_versions = $update_versions;
}
/**
* Sort versions by version compare function
* @param $a
* @param $b
* @return mixed
*/
function version_compare_sort( $a, $b ) {
return version_compare( $a, $b );
}
}
}
includes/core/class-fields.php
+38 -56
View File
@@ -553,70 +553,54 @@ if ( ! class_exists( 'Fields' ) ) {
* @param array $data
* @return boolean
*/
function is_radio_checked($key, $value, $data){
if ( isset( UM()->form()->post_form[$key] ) && is_array( UM()->form()->post_form[$key] ) ) {
if ( in_array( $value, UM()->form()->post_form[$key] ) ){
function is_radio_checked( $key, $value, $data ) {
if ( isset( UM()->form()->post_form[$key] ) ) {
if ( is_array( UM()->form()->post_form[$key] ) && in_array( $value, UM()->form()->post_form[$key] ) ) {
return true;
} elseif ( $value == UM()->form()->post_form[$key] ) {
return true;
}
} else {
if ( um_user( $key ) && $this->editing == true ) {
if ( ! isset( UM()->form()->post_form[$key] ) ) {
if ( um_user( $key ) && $this->editing == true ) {
if ( strstr( $key, 'role_' ) ) {
$key = 'role';
}
$um_user_value = um_user( $key );
if ( $key == 'role' ) {
$um_user_value = strtolower( $um_user_value );
$role_keys = get_option( 'um_roles' );
if ( ! empty( $role_keys ) ) {
if ( in_array( $um_user_value, $role_keys ) ) {
$um_user_value = 'um_' . $um_user_value;
}
}
}
if ( $um_user_value == $value ) {
return true;
}
if ( is_array( $um_user_value ) && in_array( $value, $um_user_value ) ) {
return true;
}
if ( is_array( $um_user_value ) ){
foreach( $um_user_value as $u) {
if( $u == html_entity_decode( $value ) ){
return true;
}
}
}
} else {
if ( isset($data['default']) && $data['default'] == $value ) {
return true;
}
if ( strstr( $key, 'role_' ) ) {
$key = 'role';
}
} else {
$um_user_value = um_user( $key );
if ( $value == UM()->form()->post_form[$key] ) {
if ( $key == 'role' ) {
$um_user_value = strtolower( $um_user_value );
$role_keys = get_option( 'um_roles' );
if ( ! empty( $role_keys ) ) {
if ( in_array( $um_user_value, $role_keys ) ) {
$um_user_value = 'um_' . $um_user_value;
}
}
}
if ( $um_user_value == $value ) {
return true;
}
}
if ( is_array( $um_user_value ) && in_array( $value, $um_user_value ) ) {
return true;
}
if ( is_array( $um_user_value ) ) {
foreach ( $um_user_value as $u ) {
if ( $u == html_entity_decode( $value ) ) {
return true;
}
}
}
} elseif ( isset( $data['default'] ) && $data['default'] == $value ) {
return true;
}
}
return false;
@@ -2099,7 +2083,7 @@ if ( ! class_exists( 'Fields' ) ) {
$col_class = '';
}
if ( $this->is_radio_checked($key, $option_value, $data) ) {
if ( $this->is_radio_checked( $key, $option_value, $data ) ) {
$active = 'active';
$class = "um-icon-android-radio-button-on";
} else {
@@ -2111,8 +2095,6 @@ if ( ! class_exists( 'Fields' ) ) {
$col_class .= " um-field-radio-state-disabled";
}
$output .= '<label class="um-field-radio '.$active.' um-field-half '.$col_class.'">';
$option_value = apply_filters('um_field_non_utf8_value',$option_value );