Changeset 4526

Timestamp:

11/26/2012 05:57:18 PM (11 years ago)

Author:

johnjamesjacoby

Message:

Updater:

• Move bbPress 1.x role removal out of updater and into BuddyPress's repair tool.

Location:

trunk/includes

Files:

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

trunk/includes/admin/tools.php

@@ -380 +380 @@
         update_option( '_bbp_group_forums_root_id', $posts[0]->ID );
     }
+
+    // Remove old bbPress 1.1 roles (BuddyPress)
+    remove_role( 'member'    );
+    remove_role( 'inactive'  );
+    remove_role( 'blocked'   );
+    remove_role( 'moderator' );
+    remove_role( 'keymaster' );
 
     // Complete results

trunk/includes/core/update.php

@@ -248 +248 @@
     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' );
-
         // Refresh capabilities
         bbp_remove_caps();