Changeset 5401

Timestamp:

06/14/2014 10:42:52 PM (11 years ago)

Author:

johnjamesjacoby

Message:

De-deprecate bbp_remove_roles() and use it in: bbp_admin_reset_handler(), bbp_do_uninstall(), and bbp_version_updater(). Fixes bug where old bbPress role data could still exist in wp_user_roles`. See #2065. Fixes #2580.

Location:

trunk/src/includes

Files:

• admin/functions.php (modified) (1 diff)
• admin/tools.php (modified) (1 diff)
• core/capabilities.php (modified) (2 diffs)
• core/update.php (modified) (1 diff)

trunk/src/includes/admin/functions.php

@@ -180 +180 @@
     switch_to_blog( $site_id );
     bbp_delete_options();
+    bbp_remove_roles();
     bbp_remove_caps();
     flush_rewrite_rules();

trunk/src/includes/admin/tools.php

@@ -1549 +1549 @@
 
     $statement  = __( 'Deleting Roles and Capabilities… %s', 'bbpress' );
-    remove_role( bbp_get_moderator_role() );
-    remove_role( bbp_get_participant_role() );
+    bbp_remove_roles();
     bbp_remove_caps();
     $messages[] = sprintf( $statement, $success );

trunk/src/includes/core/capabilities.php

@@ -512 +512 @@
 }
 
-/** Deprecated ****************************************************************/
-
 /**
  * Adds bbPress-specific user roles.
@@ -525 +523 @@
 
 /**
- * Removes bbPress-specific user roles.
+ * Removes bbPress-specific user roles from the `wp_user_roles` array.
+ *
+ * This is currently only used when updating, uninstalling, or resetting bbPress. 
+ *
+ * @see bbp_admin_reset_handler()
+ * @see bbp_do_uninstall()
+ * @see bbp_version_updater()
  *
  * @since bbPress (r2741)
- * @deprecated since version 2.2
  */
 function bbp_remove_roles() {

trunk/src/includes/core/update.php

@@ -269 +269 @@
     if ( $raw_db_version < 220 ) {
 
-        // Remove the Moderator role from the database
-        remove_role( bbp_get_moderator_role() );
-
-        // Remove the Participant role from the database
-        remove_role( bbp_get_participant_role() );
+        // Remove any old bbPress roles
+        bbp_remove_roles();
 
         // Remove capabilities