From e56804399a88b9d539bab0942f798ff4842e4de4 Mon Sep 17 00:00:00 2001 From: nikitozzzzzzz Date: Fri, 1 Jun 2018 17:32:39 +0300 Subject: [PATCH] - fixed default avatars; --- includes/um-short-functions.php | 176 +++++++++++++++++--------------- 1 file changed, 91 insertions(+), 85 deletions(-) diff --git a/includes/um-short-functions.php b/includes/um-short-functions.php index b0758afa..11a6c0f9 100644 --- a/includes/um-short-functions.php +++ b/includes/um-short-functions.php @@ -1766,102 +1766,108 @@ function um_get_default_avatar_uri() { * @return bool|string */ function um_get_user_avatar_data( $user_id = '', $size = '96' ) { - if( empty( $user_id ) ) { - $user_id = um_user( 'ID' ); - } else { - um_fetch_user( $user_id ); - } + if( empty( $user_id ) ) { + $user_id = um_user( 'ID' ); + } else { + um_fetch_user( $user_id ); + } - $data = array( - 'user_id' => $user_id, - 'default' => um_get_default_avatar_uri(), - 'class' => 'gravatar avatar avatar-' . $size . ' um-avatar', - 'size' => $size - ); + $data = array( + 'user_id' => $user_id, + 'default' => um_get_default_avatar_uri(), + 'class' => 'gravatar avatar avatar-' . $size . ' um-avatar', + 'size' => $size + ); if ( $profile_photo = um_profile( 'profile_photo' ) ) { $data['url'] = um_get_avatar_uri( $profile_photo, $size ); - $data['type'] = 'upload'; - $data['class'] .= ' um-avatar-uploaded'; - } else if( $synced_profile_photo = um_user( 'synced_profile_photo' ) ) { - $data['url'] = $synced_profile_photo; - $data['type'] = 'sync'; - $data['class'] .= ' um-avatar-default'; - } else if( UM()->options()->get( 'use_gravatars' ) ) { - $avatar_hash_id = get_user_meta( $user_id, 'synced_gravatar_hashed_id', true ); - $data['url'] = set_url_scheme( '//gravatar.com/avatar/' . $avatar_hash_id ); - $data['url'] = add_query_arg( 's', 400, $data['url'] ); - $rating = get_option('avatar_rating'); - if ( !empty( $rating ) ) { + $data['type'] = 'upload'; + $data['class'] .= ' um-avatar-uploaded'; + } elseif ( $synced_profile_photo = um_user( 'synced_profile_photo' ) ) { + $data['url'] = $synced_profile_photo; + $data['type'] = 'sync'; + $data['class'] .= ' um-avatar-default'; + } elseif ( UM()->options()->get( 'use_gravatars' ) ) { + $avatar_hash_id = get_user_meta( $user_id, 'synced_gravatar_hashed_id', true ); + $data['url'] = set_url_scheme( '//gravatar.com/avatar/' . $avatar_hash_id ); + $data['url'] = add_query_arg( 's', 400, $data['url'] ); + $rating = get_option( 'avatar_rating' ); + if ( ! empty( $rating ) ) { $data['url'] = add_query_arg( 'r', $rating, $data['url'] ); } - $gravatar_type = UM()->options()->get( 'use_um_gravatar_default_builtin_image' ); - if ( $gravatar_type == 'default' ) { - if ( UM()->options()->get( 'use_um_gravatar_default_image' ) ) { - $data['url'] = add_query_arg( 'd', $data['default'], $data['url'] ); - } - } else { - $default = get_option( 'avatar_default', 'mystery' ); - if ( $default == 'gravatar_default' ) { - $default = ''; - } - $data['url'] = add_query_arg( 'd', $default, $data['url'] ); - } - $data['type'] = 'gravatar'; - $data['class'] .= ' um-avatar-gravatar'; - } else { - $data['url'] = $data['default']; - $data['type'] = 'default'; - $data['class'] .= ' um-avatar-default'; - } - /** - * UM hook - * - * @type filter - * @title um_user_avatar_url_filter - * @description Change user avatar URL - * @input_vars - * [{"var":"$avatar_uri","type":"string","desc":"Avatar URL"}, - * {"var":"$user_id","type":"int","desc":"User ID"}] - * @change_log - * ["Since: 2.0"] - * @usage add_filter( 'um_user_avatar_url_filter', 'function_name', 10, 2 ); - * @example - * - */ - $data['url'] = apply_filters( 'um_user_avatar_url_filter', $data['url'], $user_id, $data ); - /** - * UM hook - * - * @type filter - * @title um_avatar_image_alternate_text - * @description Change user display name on um_user function profile photo - * @input_vars - * [{"var":"$display_name","type":"string","desc":"User Display Name"}] - * @change_log - * ["Since: 2.0"] - * @usage add_filter( 'um_avatar_image_alternate_text', 'function_name', 10, 1 ); - * @example - * - */ - $data['alt'] = apply_filters( "um_avatar_image_alternate_text", um_user( "display_name" ), $data ); + $gravatar_type = UM()->options()->get( 'use_um_gravatar_default_builtin_image' ); + if ( $gravatar_type == 'default' ) { + if ( UM()->options()->get( 'use_um_gravatar_default_image' ) ) { + $data['url'] = add_query_arg( 'd', $data['default'], $data['url'] ); + } else { + $default = get_option( 'avatar_default', 'mystery' ); + if ( $default == 'gravatar_default' ) { + $default = ''; + } + $data['url'] = add_query_arg( 'd', $default, $data['url'] ); + } + } else { + $data['url'] = add_query_arg( 'd', $gravatar_type, $data['url'] ); + } + + $data['type'] = 'gravatar'; + $data['class'] .= ' um-avatar-gravatar'; + } else { + $data['url'] = $data['default']; + $data['type'] = 'default'; + $data['class'] .= ' um-avatar-default'; + } + + + /** + * UM hook + * + * @type filter + * @title um_user_avatar_url_filter + * @description Change user avatar URL + * @input_vars + * [{"var":"$avatar_uri","type":"string","desc":"Avatar URL"}, + * {"var":"$user_id","type":"int","desc":"User ID"}] + * @change_log + * ["Since: 2.0"] + * @usage add_filter( 'um_user_avatar_url_filter', 'function_name', 10, 2 ); + * @example + * + */ + $data['url'] = apply_filters( 'um_user_avatar_url_filter', $data['url'], $user_id, $data ); + /** + * UM hook + * + * @type filter + * @title um_avatar_image_alternate_text + * @description Change user display name on um_user function profile photo + * @input_vars + * [{"var":"$display_name","type":"string","desc":"User Display Name"}] + * @change_log + * ["Since: 2.0"] + * @usage add_filter( 'um_avatar_image_alternate_text', 'function_name', 10, 1 ); + * @example + * + */ + $data['alt'] = apply_filters( "um_avatar_image_alternate_text", um_user( "display_name" ), $data ); return $data; } + /** * get user avatar url *