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

fix activation link placeholder, remove repeated um_convert_tags()

Browse Source
This commit is contained in:
andrewshuba
2019-05-06 09:24:05 +03:00
parent 8e3a42d453
commit 7a5cbf46e7
4 changed files with 40 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/admin/core/class-admin-users.php
+4
View File
@@ -85,6 +85,10 @@ if ( ! class_exists( 'um\admin\core\Admin_Users' ) ) {
break;
case 'um_resend_activation':
add_filter( 'um_template_tags_patterns_hook', 'account_activation_link_tags_patterns', 10, 1 );
add_filter( 'um_template_tags_replaces_hook', 'account_activation_link_tags_replaces', 10, 1 );
UM()->user()->email_pending();
break;
includes/core/um-actions-core.php
+3
View File
@@ -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', 'account_activation_link_tags_patterns', 10, 1 );
add_filter( 'um_template_tags_replaces_hook', 'account_activation_link_tags_replaces', 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
+9 -1
View File
@@ -18,7 +18,15 @@ function um_dynamic_user_profile_pagetitle( $title, $sep = '' ) {
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;
includes/um-short-functions.php
+24 -2
View File
@@ -124,7 +124,6 @@ function um_convert_tags( $content, $args = array(), $with_kses = true ) {
'{login_referrer}',
'{site_name}',
'{site_url}',
'{account_activation_link}',
'{admin_email}',
'{user_profile_link}',
'{user_account_link}',
@@ -167,7 +166,6 @@ function um_convert_tags( $content, $args = array(), $with_kses = true ) {
um_dynamic_login_page_redirect(),
UM()->options()->get( 'site_name' ),
get_bloginfo( 'url' ),
um_user( 'account_activation_link' ),
um_admin_email(),
um_user_profile_url(),
um_get_core_page( 'account' ),
@@ -244,6 +242,30 @@ function password_reset_link_tags_replaces( $replace_placeholders ) {
return $replace_placeholders;
}
/**
* UM Placeholders for activation link in email
*
* @param $placeholders
*
* @return array
*/
function account_activation_link_tags_patterns( $placeholders ) {
$placeholders[] = '{account_activation_link}';
return $placeholders;
}
/**
* UM Replace Placeholders for activation link in email
*
* @param $replace_placeholders
*
* @return array
*/
function account_activation_link_tags_replaces( $replace_placeholders ) {
$replace_placeholders[] = um_user( 'account_activation_link' );
return $replace_placeholders;
}
/**
* @function um_user_ip()