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

Jump to bottom

Fix avatar collision on profile, post and edit screens #996

Open
wants to merge 8 commits into
base: develop
Choose a base branch
from
Open

Fix avatar collision on profile, post and edit screens #996

Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a05e5b5
Fix avatar collision on profile, post and edit screens
katag9k Sep 6, 2023
634e2a8
resolving conflicts
katag9k Sep 15, 2023
c3b206d
Merge branch 'develop' into fix-takeover-popup-avatar-collision
katag9k Sep 15, 2023
0bfb099
adding taken over screen avatar fix
katag9k Sep 15, 2023
783a041
Merge branch 'fix-takeover-popup-avatar-collision' of github.com:Auto…
katag9k Sep 15, 2023
e8caa79
white space fix
katag9k Sep 15, 2023
2e43673
Update php/class-coauthors-plus.php
katag9k Oct 18, 2023
d255b6f
Update php/class-coauthors-plus.php
katag9k Oct 18, 2023
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
9 changes: 9 additions & 0 deletions php/class-coauthors-plus.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1826,6 +1826,15 @@ public function filter_pre_get_avatar_data_url( $args, $id ) {
return $args;
}

// do not filter on the post list screen, profile screen and post takeover pop-up
katag9k marked this conversation as resolved.
Show resolved Hide resolved
if ( isset( $current_screen->base ) && ( 'post' === $current_screen->base || 'profile' === $current_screen->base || 'edit' === $current_screen->base ) ) {
return $args;
}

// Do not filter the avatar if this is doing a heartbeat request on WP refresh lock
katag9k marked this conversation as resolved.
Show resolved Hide resolved
if ( wp_doing_ajax() && isset( $_POST['action'] ) && 'heartbeat' === $_POST['action'] ) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Is there a nonce that can be verified here for the heartbeat?
(PHPCS failure)

return $args;
}

$coauthor = $this->get_coauthor_by( 'id', $id );
if ( false !== $coauthor && isset( $coauthor->type ) && 'guest-author' === $coauthor->type ) {
Expand Down
Loading