From 695d522cb7220df9d80ae034fe7dbc6c916f9ff6 Mon Sep 17 00:00:00 2001 From: Mykyta Synelnikov Date: Mon, 14 Apr 2025 16:04:29 +0300 Subject: [PATCH] Rename 'auto_user_approve' to 'admin_ignore_user_status'. Updated the setting name across relevant files to improve clarity and better reflect its functionality. Adjusted related logic to ensure consistent behavior with the new naming. --- includes/admin/core/class-admin-settings.php | 4 ++-- includes/class-config.php | 2 +- includes/core/um-actions-register.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/includes/admin/core/class-admin-settings.php b/includes/admin/core/class-admin-settings.php index a0969df6..bdef709a 100644 --- a/includes/admin/core/class-admin-settings.php +++ b/includes/admin/core/class-admin-settings.php @@ -753,7 +753,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Settings' ) ) { 'use_um_gravatar_default_image' => array( 'sanitize' => 'bool', ), - 'auto_user_approve' => array( + 'admin_ignore_user_status' => array( 'sanitize' => 'bool', ), 'delete_comments' => array( @@ -1186,7 +1186,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Settings' ) ) { 'conditional' => array( 'use_um_gravatar_default_builtin_image', '=', 'default' ), ), array( - 'id' => 'auto_user_approve', + 'id' => 'admin_ignore_user_status', 'type' => 'checkbox', 'label' => __( 'Ignore the "User Role > Registration Options"', 'ultimate-member' ), 'checkbox_label' => __( 'Automatically approve users from the wp-admin dashboard', 'ultimate-member' ), diff --git a/includes/class-config.php b/includes/class-config.php index 97c6aec1..f77a229f 100644 --- a/includes/class-config.php +++ b/includes/class-config.php @@ -658,7 +658,7 @@ if ( ! class_exists( 'um\Config' ) ) { 'use_gravatars' => false, 'use_um_gravatar_default_builtin_image' => 'default', 'use_um_gravatar_default_image' => false, - 'auto_user_approve' => false, + 'admin_ignore_user_status' => false, 'toggle_password' => false, 'require_strongpass' => false, 'password_min_chars' => 8, diff --git a/includes/core/um-actions-register.php b/includes/core/um-actions-register.php index 0dd11a1b..29a73e1a 100644 --- a/includes/core/um-actions-register.php +++ b/includes/core/um-actions-register.php @@ -142,7 +142,7 @@ add_action( 'um_registration_complete', 'um_send_registration_notification' ); * @param null|array $form_data */ function um_check_user_status( $user_id, $args, $form_data = null ) { - if ( ( is_null( $form_data ) || is_admin() ) && UM()->options()->get( 'auto_user_approve' ) ) { + if ( ( is_null( $form_data ) || is_admin() ) && UM()->options()->get( 'admin_ignore_user_status' ) ) { $registration_status = 'approved'; } else { $registration_status = um_user( 'status' );