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

Fixing the issue in the role fields.

Browse Source 
Fields "Roles (Dropdown)" and "Roles (Radio)" may work wrong if a member has several roles with the same priority. Old code gets the first role even if it is not editable. This change fixes the issue.
This commit is contained in:
denisbaranov
2020-03-30 19:40:36 +03:00
parent f3f09e46b0
commit 7e7c8dd75c
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/core/class-fields.php
+8 -11
View File
@@ -963,7 +963,8 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
$value = (int) $value;
}
if ( $key == 'role' ) {
if ( strstr( $key, 'role_' ) || $key == 'role' ) {
$field_value = strtolower( UM()->roles()->get_editable_priority_user_role( um_user( 'ID' ) ) );
$role_keys = get_option( 'um_roles' );
@@ -1095,7 +1096,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
*/
function is_radio_checked( $key, $value, $data ) {
global $wpdb;
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;
@@ -1107,14 +1108,10 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
if ( $this->editing && 'custom' !== $this->set_mode ) {
if ( um_user( $key ) ) {
if ( strstr( $key, 'role_' ) ) {
$key = 'role';
}
$um_user_value = um_user( $key );
if ( $key == 'role' ) {
$um_user_value = strtolower( $um_user_value );
if ( strstr( $key, 'role_' ) || $key == 'role' ) {
$um_user_value = strtolower( UM()->roles()->get_editable_priority_user_role( um_user( 'ID' ) ) );
$role_keys = get_option( 'um_roles' );
@@ -2124,7 +2121,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
* }
* ?>
*/
$output .= apply_filters( "um_edit_field_{$mode}_{$type}", $output, $data );
break;
@@ -2165,7 +2162,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
$output .= $this->field_notice( $this->show_notice( $key ) );
}
$output .= '</div>';
$output .= '</div>';
break;
/* Text */
@@ -3342,7 +3339,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
foreach ( $options as $k => $v ) {
$v = rtrim( $v );
$um_field_checkbox_item_title = $v;
$option_value = $v;