Changeset 4337

Timestamp:

11/04/2012 09:39:54 PM (12 years ago)

Author:

johnjamesjacoby

Message:

Capabilities:

• Use bbp_get_default_role() in bbp_get_user_role_map().
• See #1939.

File:

• trunk/includes/users/capabilities.php (modified) (1 diff)

trunk/includes/users/capabilities.php

@@ -137 +137 @@
  */
 function bbp_get_user_role_map() {
+
+    // Get the default role once here
+    $default_role = bbp_get_default_role();
+
+    // Return filtered results, forcing admins to keymasters.
     return (array) apply_filters( 'bbp_get_user_role_map', array (
         'administrator' => bbp_get_keymaster_role(),
-        'editor'        => bbp_get_participant_role(),
-        'author'        => bbp_get_participant_role(),
-        'contributor'   => bbp_get_participant_role(),
-        'subscriber'    => bbp_get_participant_role(),
-        ''              => bbp_get_participant_role()
+        'editor'        => $default_role,
+        'author'        => $default_role,
+        'contributor'   => $default_role,
+        'subscriber'    => $default_role,
+        ''              => $default_role
     ) );
 }