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

# Conflicts:
#	includes/um-short-functions.php

includes/core/class-user.php

@@ -1901,5 +1901,31 @@ if ( ! class_exists( 'um\core\User' ) ) {
 
 			return $hash_email_address;
 		}
+
+
+		/**
+		 * UM Placeholders for activation link in email
+		 *
+		 * @param $placeholders
+		 *
+		 * @return array
+		 */
+		function add_activation_placeholder( $placeholders ) {
+			$placeholders[] = '{account_activation_link}';
+			return $placeholders;
+		}
+
+
+		/**
+		 * UM Replace Placeholders for activation link in email
+		 *
+		 * @param $replace_placeholders
+		 *
+		 * @return array
+		 */
+		function add_activation_replace_placeholder( $replace_placeholders ) {
+			$replace_placeholders[] = um_user( 'account_activation_link' );
+			return $replace_placeholders;
+		}
 	}
 }

includes/core/um-actions-core.php

@@ -123,6 +123,9 @@ function um_action_request_process() {
 				wp_die( __( 'You do not have permission to make this action.', 'ultimate-member' ) );
 			}
 
+			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_fetch_user( $uid );
 			UM()->user()->email_pending();
 			exit( wp_redirect( UM()->permalinks()->get_current_url( true ) ) );

includes/core/um-filters-profile.php

@@ -14,11 +14,19 @@ function um_dynamic_user_profile_pagetitle( $title, $sep = '' ) {
 
 	$profile_title = UM()->options()->get( 'profile_title' );
 
-	if ( um_is_core_page('user') && um_get_requested_user() ) {
+	if ( um_is_core_page( 'user' ) && um_get_requested_user() ) {
 
 		um_fetch_user( um_get_requested_user() );
 
-		$profile_title = um_convert_tags( $profile_title );
+		$search = array(
+			'{display_name}',
+			'{site_name}'
+		);
+		$replace = array(
+			um_user( 'display_name' ),
+			UM()->options()->get( 'site_name' )
+		);
+		$profile_title = str_replace( $search, $replace, $profile_title );
 
 		$title = $profile_title;