Changeset 4451

Timestamp:

11/21/2012 02:23:42 AM (13 years ago)

Author:

johnjamesjacoby

Message:

Tools/Roles:

• In user-map repair tool, use default role if role-map entry does not exist.
• See #2042 (trunk)

File:

• trunk/includes/admin/tools.php (modified) (3 diffs)

trunk/includes/admin/tools.php

@@ -681 +681 @@
 function bbp_admin_repair_user_roles() {
 
-    $statement = __( 'Remapping forum role for each user on this site… %s', 'bbpress' );
-    $changed   = 0;
-    $role_map  = bbp_get_user_role_map();
+    $statement    = __( 'Remapping forum role for each user on this site… %s', 'bbpress' );
+    $changed      = 0;
+    $role_map     = bbp_get_user_role_map();
+    $default_role = bbp_get_default_role();
 
     // Bail if no role map exists
@@ -695 +696 @@
         $offset = 0;
 
+        // If no role map exists, give the default forum role (bbp-participant)
+        $new_role = isset( $role_map[$role] ) ? $role_map[$role] : $default_role;
+            
         // Get users of this site, limited to 1000
         while ( $users = get_users( array(
@@ -705 +709 @@
             // Iterate through each user of $role and try to set it
             foreach ( (array) $users as $user_id ) {
-                if ( bbp_set_user_role( $user_id, $role_map[$role] ) ) {
+                if ( bbp_set_user_role( $user_id, $new_role ) ) {
                     ++$changed; // Keep a count to display at the end
                 }