10h30/ultimatemember
1
0
Fork 0
mirror of https://github.com/10h30/ultimatemember.git synced 2026-07-13 19:56:27 +09:00
Code Issues Packages Projects Releases Wiki Activity

* updated statuses logic;

Browse Source
This commit is contained in:
Mykyta Synelnikov
2024-09-30 23:10:15 +03:00
parent 67ea631681
commit 6f9be57495
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/admin/class-users-columns.php
+6 -1
View File
@@ -133,7 +133,12 @@ if ( ! class_exists( 'um\admin\Users_Columns' ) ) {
admin_url( 'users.php' )
);
$row_actions[] = '<a href="' . esc_url( $url ) . '" class="um-resend-activation-email">' . esc_html__( 'Resend activation email', 'ultimate-member' ) . '</a>';
$title = __( 'Send activation email', 'ultimate-member' );
if ( UM()->common()->users()->has_status( $user_id, 'awaiting_email_confirmation' ) ) {
$title = __( 'Resend activation email', 'ultimate-member' );
}
$row_actions[] = '<a href="' . esc_url( $url ) . '" class="um-resend-activation-email">' . esc_html( $title ) . '</a>';
}
if ( UM()->common()->users()->can_be_deactivated( $user_id ) ) {
$url = add_query_arg(
includes/common/class-users.php
+1 -1
View File
@@ -634,7 +634,7 @@ class Users {
}*/
$status = $this->get_status( $user_id );
return 'approved' !== $status;
return 'approved' !== $status && 'inactive' !== $status; // inactive can be only reactivated
}
/**
includes/frontend/class-users.php
+5 -1
View File
@@ -43,7 +43,11 @@ class Users {
$actions['put_user_as_pending'] = array( 'label' => __( 'Put as Pending Review', 'ultimate-member' ) );
}
if ( UM()->common()->users()->can_activation_send( $user_id ) ) {
$actions['resend_user_activation'] = array( 'label' => __( 'Resend Activation Email', 'ultimate-member' ) );
$title = __( 'Send activation email', 'ultimate-member' );
if ( UM()->common()->users()->has_status( $user_id, 'awaiting_email_confirmation' ) ) {
$title = __( 'Resend activation email', 'ultimate-member' );
}
$actions['resend_user_activation'] = array( 'label' => $title );
}
if ( UM()->common()->users()->can_be_deactivated( $user_id ) ) {
$actions['deactivate_user'] = array( 'label' => __( 'Deactivate this account', 'ultimate-member' ) );