Merge remote-tracking branch 'remotes/origin/fix_reset_pass_hash_after_approve'

# Conflicts:
#	includes/um-short-functions.php
This commit is contained in:
nikitasinelnikov
2019-05-06 10:15:58 +03:00
6 changed files with 93 additions and 17 deletions
@@ -85,6 +85,10 @@ if ( ! class_exists( 'um\admin\core\Admin_Users' ) ) {
break;
case 'um_resend_activation':
add_filter( 'um_template_tags_patterns_hook', array( UM()->user(), 'add_activation_placeholder' ), 10, 1 );
add_filter( 'um_template_tags_replaces_hook', array( UM()->user(), 'add_activation_replace_placeholder' ), 10, 1 );
UM()->user()->email_pending();
break;