Merge branch 'development/2.8.x' into feature/action-schedule-integration

This commit is contained in:
Mykyta Synelnikov
2024-10-21 17:45:42 +03:00
committed by GitHub
108 changed files with 4867 additions and 2914 deletions
+5 -5
View File
@@ -638,7 +638,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Settings' ) ) {
),
array(
'id' => 'restricted_block_message',
'type' => 'textarea',
'type' => 'wp_editor',
'label' => __( 'Restricted Access Block Message', 'ultimate-member' ),
'description' => __( 'This is the message shown to users that do not have permission to view the block\'s content.', 'ultimate-member' ),
'conditional' => array( 'restricted_blocks', '=', 1 ),
@@ -650,7 +650,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Settings' ) ) {
'sanitize' => 'bool',
);
$settings_map['restricted_block_message'] = array(
'sanitize' => 'textarea',
'sanitize' => 'wp_kses',
);
}
@@ -769,7 +769,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Settings' ) ) {
'sanitize' => 'bool',
),
'activation_link_expiry_time' => array(
'sanitize' => 'absint',
'sanitize' => 'empty_absint',
),
'account_tab_password' => array(
'sanitize' => 'bool',
@@ -2784,7 +2784,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Settings' ) ) {
if ( ! empty( $results ) ) {
foreach ( $results as $user_id ) {
$md_data = get_user_meta( $user_id, 'um_member_directory_data', true );
if ( ! empty( $md_data ) ) {
if ( ! empty( $md_data ) && is_array( $md_data ) ) {
$md_data['profile_photo'] = ! empty( $_POST['um_options']['use_gravatars'] );
update_user_meta( $user_id, 'um_member_directory_data', $md_data );
}
@@ -2834,7 +2834,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Settings' ) ) {
if ( ! empty( $results ) ) {
foreach ( $results as $user_id ) {
$md_data = get_user_meta( $user_id, 'um_member_directory_data', true );
if ( ! empty( $md_data ) ) {
if ( ! empty( $md_data ) && is_array( $md_data ) ) {
$md_data['hide_in_members'] = ( $_POST['um_options']['account_hide_in_directory_default'] === 'No' ) ? false : true;
update_user_meta( $user_id, 'um_member_directory_data', $md_data );
}