Changeset 4528

Timestamp:

11/26/2012 06:10:31 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.
• Move BuddyPress role removal into groups repair tool.
• See #2065 (2.2 branch)

Location:

branches/2.2

Files:

• bbpress.php (modified) (1 diff)
• includes/admin/tools.php (modified) (3 diffs)
• includes/core/update.php (modified) (1 diff)

branches/2.2/bbpress.php

@@ -182 +182 @@
 
         $this->version    = '2.2.2';
-        $this->db_version = '220';
+        $this->db_version = '223';
 
         /** Paths *************************************************************/

branches/2.2/includes/admin/tools.php

@@ -380 +380 @@
         update_option( '_bbp_group_forums_root_id', $posts[0]->ID );
     }
+
+    // Remove bbPress 1.1 roles (BuddyPress)
+    remove_role( 'member'    );
+    remove_role( 'inactive'  );
+    remove_role( 'blocked'   );
+    remove_role( 'moderator' );
+    remove_role( 'keymaster' );
 
     // Complete results
@@ -1109 +1116 @@
 
         $statement  = __( 'Deleting Settings… %s', 'bbpress' );
-        $sql_delete = bbp_delete_options();
+        bbp_delete_options();
         $messages[] = sprintf( $statement, $success );
 
@@ -1115 +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() );
+        bbp_remove_caps();
         $messages[] = sprintf( $statement, $success );
 

branches/2.2/includes/core/update.php

@@ -247 +247 @@
 
     // 2.2
-    if ( $raw_db_version < 220 ) {
-
-        // Remove bbPress 1.1 roles (BuddyPress)
-        remove_role( 'member'    );
-        remove_role( 'inactive'  );
-        remove_role( 'blocked'   );
-        remove_role( 'moderator' );
-        remove_role( 'keymaster' );
+    if ( $raw_db_version < 223 ) {
+
+        // 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() );
 
         // Refresh capabilities