mirror of
https://github.com/10h30/ultimatemember.git
synced 2026-06-05 15:09:37 +09:00
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.
This commit is contained in:
@@ -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' ),
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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' );
|
||||
|
||||
Reference in New Issue
Block a user