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

- fixed replace placeholders for not logged in users;

Browse Source 
- small notice fix;
This commit is contained in:
nikitozzzzzzz
2018-02-15 11:08:14 +02:00
parent 1582d11bbc
commit 440aa59b28
3 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/core/class-shortcodes.php
+16 -17
View File
@@ -598,29 +598,28 @@ if ( ! class_exists( 'Shortcodes' ) ) {
//$matches = false;
foreach ( $pattern_array as $pattern ) {
$value = '';
if ( preg_match( $pattern, $str ) ) {
$usermeta = str_replace( '{', '', $pattern );
$usermeta = str_replace( '}', '', $usermeta );
$value = '';
if ( is_user_logged_in() ) {
$usermeta = str_replace( '{', '', $pattern );
$usermeta = str_replace( '}', '', $usermeta );
if ( $usermeta == 'user_avatar_small' ) {
$value = get_avatar( um_user( 'ID' ), 40 );
} elseif ( um_user( $usermeta ) ) {
$value = um_user( $usermeta );
}
if ( $usermeta == 'username' ) {
$value = um_user( 'user_login' );
}
$value = apply_filters( "um_profile_tag_hook__{$usermeta}", $value, um_user( 'ID' ) );
if ( $value ) {
$str = preg_replace( '/' . $pattern . '/', $value, $str );
if ( $usermeta == 'user_avatar_small' ) {
$value = get_avatar( um_user( 'ID' ), 40 );
} elseif ( um_user( $usermeta ) ) {
$value = um_user( $usermeta );
}
if ( $usermeta == 'username' ) {
$value = um_user( 'user_login' );
}
$value = apply_filters( "um_profile_tag_hook__{$usermeta}", $value, um_user( 'ID' ) );
}
$str = preg_replace( '/' . $pattern . '/', $value, $str );
}
}
includes/core/class-user.php
+3 -2
View File
@@ -913,6 +913,7 @@ if ( ! class_exists( 'User' ) ) {
UM()->mail()->send( um_user('user_email'), 'inactive_email' );
}
/***
*** @delete user
***/
@@ -1173,8 +1174,8 @@ if ( ! class_exists( 'User' ) ) {
$exclude_roles = array_diff( array_keys( $wp_roles->roles ), array_merge( $role_keys, array( 'subscriber' ) ) );
if ( in_array( $args['role'], $exclude_roles ) ) {
unset($args['role']);
if ( isset( $args['role'] ) && in_array( $args['role'], $exclude_roles ) ) {
unset( $args['role'] );
}
wp_update_user( $args );
includes/core/um-filters-navmenu.php
+3 -2
View File
@@ -12,9 +12,10 @@ if ( ! defined( 'ABSPATH' ) ) exit;
* @return mixed
*/
function um_add_custom_message_to_menu( $items, $args ) {
// this feature required logged in user
if ( ! is_user_logged_in() )
if ( ! is_user_logged_in() ) {
$items = UM()->shortcodes()->convert_user_tags( $items );
return $items;
}
um_fetch_user( get_current_user_id() );
$items = UM()->shortcodes()->convert_user_tags( $items );