Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: user meta retrieval #302

Merged
merged 5 commits into from
Oct 14, 2024
Merged

fix: user meta retrieval #302

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
93079b0
fix: user meta retrieval
adekbadek Aug 28, 2024
d9ff4bb
fix: static method; use in more places
adekbadek Sep 2, 2024
eeb66bc
feat: add isset check
adekbadek Sep 13, 2024
4d775cc
Update includes/class-simple-local-avatars.php
faisal-alvi Sep 13, 2024
946d757
Update includes/class-simple-local-avatars.php
faisal-alvi Sep 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions includes/class-simple-local-avatars.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,20 @@ public function get_user_id( $id_or_email ) {
return $user_id;
}

/**
* Get the local avatar user meta.
*
* @param int $user_id User ID.
* @return array Array with avatar data.
*/
public static function get_user_local_avatar( $user ) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We use the variable $user_id but the only variable passed in is $user. I think that just needs updated:

Suggested change
public static function get_user_local_avatar( $user ) {
public static function get_user_local_avatar( $user_id ) {

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because this method is marked as static, we get an error when trying to use $this later on

$local_avatars = get_user_meta( $user_id, $this->user_key, true );
if ( ! is_array( $local_avatars ) || empty( $local_avatars ) ) {
return [];
}
return $local_avatars;
}

/**
* Get local avatar url.
*
Expand All @@ -343,7 +357,7 @@ public function get_simple_local_avatar_url( $id_or_email, $size ) {
}

// Fetch local avatar from meta and make sure it's properly set.
$local_avatars = get_user_meta( $user_id, $this->user_key, true );
$local_avatars = self::get_user_local_avatar( $user_id );
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we change the above method to not be static, this will need updated:

Suggested change
$local_avatars = self::get_user_local_avatar( $user_id );
$local_avatars = $this->get_user_local_avatar( $user_id );

if ( empty( $local_avatars['full'] ) ) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This condition might cause a PHP notice or warning if the get_user_local_avatar() method returns an array that doesn't have the full key or if an empty array is returned. To avoid the notice, we can check if the key exists before accessing it.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added a check in eeb66bc

return '';
}
Expand Down Expand Up @@ -1181,7 +1195,7 @@ public function ajax_assign_simple_local_avatar_media() {
* @param int $user_id User ID.
*/
public function avatar_delete( $user_id ) {
$old_avatars = (array) get_user_meta( $user_id, $this->user_key, true );
$old_avatars = self::get_user_local_avatar( $user_id );
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
$old_avatars = self::get_user_local_avatar( $user_id );
$old_avatars = $this->get_user_local_avatar( $user_id );


if ( empty( $old_avatars ) ) {
return;
Expand Down
Loading