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

- minified scripts;

Browse Source 
- fixed PHP notice with slider's range;
- fixed the issue with the password reset hash;
This commit is contained in:
nikitasinelnikov
2021-03-08 16:59:11 +02:00
parent 88765d26ef
commit a8de403837
9 changed files with 33 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/core/class-user.php
+22 -4
View File
@@ -25,6 +25,7 @@ if ( ! class_exists( 'um\core\User' ) ) {
$this->data = null;
$this->profile = null;
$this->cannot_edit = null;
$this->password_reset_key = null;
global $wpdb;
@@ -1356,12 +1357,27 @@ if ( ! class_exists( 'um\core\User' ) ) {
}
/**
* @param \WP_User $userdata
*
* @return string|\WP_Error
*/
function maybe_generate_password_reset_key( $userdata ) {
if ( empty( $this->password_reset_key ) ) {
$this->password_reset_key = get_password_reset_key( $userdata );
}
return $this->password_reset_key ;
}
/**
* Password reset email
*/
function password_reset() {
$userdata = get_userdata( um_user( 'ID' ) );
get_password_reset_key( $userdata );
$this->maybe_generate_password_reset_key( $userdata );
add_filter( 'um_template_tags_patterns_hook', array( UM()->password(), 'add_placeholder' ), 10, 1 );
add_filter( 'um_template_tags_replaces_hook', array( UM()->password(), 'add_replace_placeholder' ), 10, 1 );
@@ -1407,12 +1423,14 @@ if ( ! class_exists( 'um\core\User' ) ) {
if ( um_user( 'account_status' ) == 'awaiting_admin_review' ) {
$userdata = get_userdata( $user_id );
get_password_reset_key( $userdata );
$this->maybe_generate_password_reset_key( $userdata );
UM()->mail()->send( um_user( 'user_email' ), 'approved_email' );
} else {
$userdata = get_userdata( $user_id );
get_password_reset_key( $userdata );
//$userdata = get_userdata( $user_id );
//get_password_reset_key( $userdata );
UM()->mail()->send( um_user( 'user_email' ), 'welcome_email' );
}