Changeset 10918

Timestamp:

04/21/2021 07:58:50 AM (5 years ago)

Author:

dd32

Message:

Support: Break a users password if they're blocked already and are being re-blocked and the password isn't broken.

Also, WP_User::has_role() is not a method, call WP_User::has_cap() instead.
See ​https://core.trac.wordpress.org/ticket/53066.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-hooks.php (modified) (3 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-hooks.php

@@ -458 +458 @@
                 } elseif ( bbp_is_single_user() ) {
                         // Blocked users are not indexed.
-                        if ( bbpress()->displayed_user && bbpress()->displayed_user->has_cap( 'bbp_blocked' ) ) {
+                        if ( bbpress()->displayed_user && bbpress()->displayed_user->has_cap( bbp_get_blocked_role() ) ) {
                                 $robots = true;
 
@@ -1316 +1316 @@
                 $note_text       = false;
 
-                if ( $blocked_role === $new_role && ! $password_broken ) {
+                if (
+                        ( $blocked_role === $new_role || $user->has_cap( $blocked_role ) ) &&
+                        ! $password_broken
+                ) {
                         // User has been blocked, break their password and sessions.
                         // WordPress doesn't have a way to edit a user password without re-hashing it.
@@ -1342 +1345 @@
                 } else if (
                         $password_broken &&
-                        ! $user->has_role( $blocked_role )
+                        ! $user->has_cap( $blocked_role )
                 ) {
                         // User was blocked (broken password) but no longer is.