From 22b60a5a28d55b929c5d51272d10f8a8300c2cd0 Mon Sep 17 00:00:00 2001 From: yura_nalivaiko Date: Tue, 1 May 2018 10:53:16 +0300 Subject: [PATCH] fix --- includes/core/class-rest-api.php | 18 +++++++++--------- includes/um-short-functions.php | 9 +++++---- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/includes/core/class-rest-api.php b/includes/core/class-rest-api.php index bd42c056..8a75f37e 100644 --- a/includes/core/class-rest-api.php +++ b/includes/core/class-rest-api.php @@ -524,9 +524,9 @@ if ( ! class_exists( 'um\core\REST_API' ) ) { $val->first_name = um_user('first_name'); $val->last_name = um_user('last_name'); $val->account_status = um_user('account_status'); - $val->profile_pic_original = $this->getsrc( um_user('profile_photo', 'original') ); - $val->profile_pic_normal = $this->getsrc( um_user('profile_photo', 200) ); - $val->profile_pic_small = $this->getsrc( um_user('profile_photo', 40) ); + $val->profile_pic_original = um_get_user_avatar_url('', 'original'); + $val->profile_pic_normal = um_get_user_avatar_url('', 200); + $val->profile_pic_small = um_get_user_avatar_url('', 40); $val->cover_photo = $this->getsrc( um_user('cover_photo', 1000) ); /** @@ -667,9 +667,9 @@ if ( ! class_exists( 'um\core\REST_API' ) ) { break; case 'profile_pic': - $response['profile_pic_original'] = $this->getsrc( um_user('profile_photo', 'original') ); - $response['profile_pic_normal'] = $this->getsrc( um_user('profile_photo', 200) ); - $response['profile_pic_small'] = $this->getsrc( um_user('profile_photo', 40) ); + $response['profile_pic_original'] = um_get_user_avatar_url('', 'original'); + $response['profile_pic_normal'] = um_get_user_avatar_url('', 200); + $response['profile_pic_small'] = um_get_user_avatar_url('', 40); break; case 'status': @@ -699,9 +699,9 @@ if ( ! class_exists( 'um\core\REST_API' ) ) { $val->first_name = um_user('first_name'); $val->last_name = um_user('last_name'); $val->account_status = um_user('account_status'); - $val->profile_pic_original = $this->getsrc( um_user('profile_photo', 'original') ); - $val->profile_pic_normal = $this->getsrc( um_user('profile_photo', 200) ); - $val->profile_pic_small = $this->getsrc( um_user('profile_photo', 40) ); + $val->profile_pic_original = um_get_user_avatar_url('', 'original'); + $val->profile_pic_normal = um_get_user_avatar_url('', 200); + $val->profile_pic_small = um_get_user_avatar_url('', 40); $val->cover_photo = $this->getsrc( um_user('cover_photo', 1000) ); /** diff --git a/includes/um-short-functions.php b/includes/um-short-functions.php index 52234e1e..ca1a7f0e 100644 --- a/includes/um-short-functions.php +++ b/includes/um-short-functions.php @@ -1752,10 +1752,11 @@ 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 = get_current_user_id(); - - 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,