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

Merge pull request #1648 from ultimatemember/fix/activate_account_via_email_link

Browse Source 
Activation link redirects to Reset Password (CU-86cy0809h)
This commit is contained in:
Mykyta Synelnikov
2025-02-28 13:57:17 +02:00
committed by GitHub
parent 2c46002fa5 c0d506b199
commit 429e810048
2 changed files with 841 additions and 823 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/core/class-permalinks.php
+9 -8
View File
@@ -134,15 +134,9 @@ if ( ! class_exists( 'um\core\Permalinks' ) ) {
exit;
}
$redirect = um_get_core_page( 'login', 'account_active' );
$set_password_required = get_user_meta( $user_id, 'um_set_password_required', true );
// approve.
um_fetch_user( $user_id );
UM()->common()->users()->approve( $user_id, true );
if ( ! empty( $set_password_required ) ) {
$redirect = um_user( 'password_reset_link' );
}
um_reset_user();
$user_role = UM()->roles()->get_priority_user_role( $user_id );
$user_role_data = UM()->roles()->role_data( $user_role );
@@ -174,8 +168,15 @@ if ( ! class_exists( 'um\core\Permalinks' ) ) {
*/
do_action( 'um_after_email_confirmation', $user_id );
// redirect.
$set_password_required = get_user_meta( $user_id, 'um_set_password_required', true );
if ( empty( $set_password_required ) ) {
$redirect = empty( $user_role_data['url_email_activate'] ) ? um_get_core_page( 'login', 'account_active' ) : trim( $user_role_data['url_email_activate'] ); // Role setting "URL redirect after email activation"
// Role setting "URL redirect after email activation".
$redirect = empty( $user_role_data['url_email_activate'] ) ? um_get_core_page( 'login', 'account_active' ) : trim( $user_role_data['url_email_activate'] );
} else {
// Redirect to the change password page if there is no password for this user.
um_fetch_user( $user_id );
$redirect = um_user( 'password_reset_link' );
}
$redirect = apply_filters( 'um_after_email_confirmation_redirect', $redirect, $user_id, $login );
languages/ultimate-member.pot
+832 -815
View File
File diff suppressed because it is too large Load Diff