Changeset 4527

Timestamp:

11/26/2012 06:07:33 PM (12 years ago)

Author:

johnjamesjacoby

Message:

Roles:

• When updating bbPress and normalizing user roles, remove the old moderator and participant roles from the database.
• Props jmdodd.
• Fixes #2065.

Location:

trunk/includes

Files:

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

trunk/includes/admin/tools.php

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

trunk/includes/core/update.php

@@ -248 +248 @@
     if ( $raw_db_version < 220 ) {
 
-        // Refresh capabilities
+        // 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 capabilities
         bbp_remove_caps();
     }