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 remote-tracking branch 'remotes/origin/fix_reset_pass_hash_after_approve'

Browse Source
This commit is contained in:
nikitasinelnikov
2019-05-07 14:56:22 +03:00
parent 9b4408436b 82a119e1ef
commit ec93755dc8
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/core/class-mail.php
+4
View File
@@ -585,11 +585,13 @@ if ( ! class_exists( 'um\core\Mail' ) ) {
* @return array
*/
function add_placeholder( $placeholders ) {
$placeholders[] = '{user_profile_link}';
$placeholders[] = '{site_url}';
$placeholders[] = '{admin_email}';
$placeholders[] = '{submitted_registration}';
$placeholders[] = '{login_url}';
$placeholders[] = '{password}';
$placeholders[] = '{account_activation_link}';
return $placeholders;
}
@@ -602,11 +604,13 @@ if ( ! class_exists( 'um\core\Mail' ) ) {
* @return array
*/
function add_replace_placeholder( $replace_placeholders ) {
$replace_placeholders[] = um_user_profile_url();
$replace_placeholders[] = get_bloginfo( 'url' );
$replace_placeholders[] = um_admin_email();
$replace_placeholders[] = um_user_submitted_registration();
$replace_placeholders[] = um_get_core_page( 'login' );
$replace_placeholders[] = esc_html__( 'Your set password', 'ultimate-member' );
$replace_placeholders[] = um_user( 'account_activation_link' );
return $replace_placeholders;
}
}
includes/core/class-user.php
-1
View File
@@ -1248,7 +1248,6 @@ if ( ! class_exists( 'um\core\User' ) ) {
$this->set_status('approved');
$this->delete_meta('account_secret_hash');
$this->delete_meta('_um_cool_but_hard_to_guess_plain_pw');
/**
* UM hook