mirror of
https://github.com/10h30/ultimatemember.git
synced 2026-06-05 15:09:37 +09:00
Merge remote-tracking branch 'remotes/origin/fix/helpscout#24971' into release/2.0.30
This commit is contained in:
@@ -42,4 +42,30 @@ function um_get_avatar( $avatar = '', $id_or_email='', $size = '96', $avatar_cla
|
||||
|
||||
return $avatar;
|
||||
}
|
||||
add_filter( 'get_avatar', 'um_get_avatar', 99999, 5 );
|
||||
add_filter( 'get_avatar', 'um_get_avatar', 99999, 5 );
|
||||
|
||||
|
||||
/**
|
||||
* Replace Gravatar image URL to Ultimate member profile image URL if setting "Use Gravatars?" disabled
|
||||
* @param string $url
|
||||
* @param int $id_or_email
|
||||
* @param array $args
|
||||
* @return string
|
||||
*/
|
||||
if ( !function_exists( 'um_filter_get_avatar_url' ) ) {
|
||||
|
||||
function um_filter_get_avatar_url( $url, $id_or_email, $args ) {
|
||||
|
||||
if ( is_numeric( $id_or_email ) && !UM()->options()->get( 'use_gravatars' ) && preg_match( '/gravatar/i', $url ) ) {
|
||||
$data = um_get_user_avatar_data( $id_or_email, $args['size'] );
|
||||
if ( !empty( $data['url'] ) ) {
|
||||
$url = $data['url'];
|
||||
}
|
||||
}
|
||||
|
||||
return $url;
|
||||
}
|
||||
|
||||
// hooked in the get_avatar_data function
|
||||
add_filter( 'get_avatar_url', 'um_filter_get_avatar_url', 20, 3 );
|
||||
}
|
||||
Reference in New Issue
Block a user