Skip to content

Support Forums: Audit Log: Avoid a PHP warning when a forum role is set to the user's current role #1092

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

Closed
bor0 wants to merge 2 commits into from
Closed

Support Forums: Audit Log: Avoid a PHP warning when a forum role is set to the user's current role #1092

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
090ebbe
Support Forums: Audit Log: Avoid a PHP warning when a forum role is s…
bor0 Oct 22, 2026
82c235f
Merge branch 'trunk' into fix/forums-audit-log-null-role
bor0 Oct 22, 2026
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
12 changes: 10 additions & 2 deletions wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-audit-log.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,14 @@ function monitor_role_changes( $user_id, $role ) {
function bbp_set_user_role( $new_role, $user_id, WP_User $user ) {
$previous_role = $this->last_role_change[ $user_id ][ 'remove_user_role' ] ?? false;

// Don't let this change leak into a later bbp_set_user_role() call in the same request.
unset( $this->last_role_change[ $user_id ] );

// bbPress passes false when the role wasn't changed.
if ( ! $new_role ) {
return $new_role; // We're on a filter.
}

// For the purposes of this function, a previous participant role is irrelevant.
if ( bbp_get_participant_role() == $previous_role ) {
$previous_role = false;
Expand Down Expand Up @@ -117,8 +125,8 @@ function bbp_set_user_role( $new_role, $user_id, WP_User $user ) {
// Add a user note about this action.
$note_text = sprintf(
'Forum role changed to %s%s%s.',
get_role( $new_role )->name,
$previous_role ? sprintf( ' from %s', get_role( $previous_role )->name ) : '',
$new_role,
$previous_role ? sprintf( ' from %s', $previous_role ) : '',
$where_from ? sprintf( ' via %s', $where_from ) : ''
);

Expand Down
Loading