Changeset 6108 for trunk/src/includes/core/capabilities.php

Timestamp:

11/01/2016 05:23:39 AM (8 years ago)

Author:

johnjamesjacoby

Message:

Roles: Improve performance of bbp_get_dynamic_roles() with a local static variable.

Previously, it rebuilt the multidimensional array of role keys & strings each time it was called, which may be several depending on the page being loaded.

See: #2452.

File:

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

trunk/src/includes/core/capabilities.php

@@ -367 +367 @@
  */
 function bbp_get_dynamic_roles() {
-    return (array) apply_filters( 'bbp_get_dynamic_roles', array(
-
-        // Keymaster
-        bbp_get_keymaster_role() => array(
-            'name'         => __( 'Keymaster', 'bbpress' ),
-            'capabilities' => bbp_get_caps_for_role( bbp_get_keymaster_role() )
-        ),
-
-        // Moderator
-        bbp_get_moderator_role() => array(
-            'name'         => __( 'Moderator', 'bbpress' ),
-            'capabilities' => bbp_get_caps_for_role( bbp_get_moderator_role() )
-        ),
-
-        // Participant
-        bbp_get_participant_role() => array(
-            'name'         => __( 'Participant', 'bbpress' ),
-            'capabilities' => bbp_get_caps_for_role( bbp_get_participant_role() )
-        ),
-
-        // Spectator
-        bbp_get_spectator_role() => array(
-            'name'         => __( 'Spectator', 'bbpress' ),
-            'capabilities' => bbp_get_caps_for_role( bbp_get_spectator_role() )
-        ),
-
-        // Blocked
-        bbp_get_blocked_role() => array(
-            'name'         => __( 'Blocked', 'bbpress' ),
-            'capabilities' => bbp_get_caps_for_role( bbp_get_blocked_role() )
-        )
-    ) );
+    static $bbp_roles = null;
+
+    // Only run once
+    if ( null === $bbp_roles ) {
+        $bbp_roles = array(
+
+            // Keymaster
+            bbp_get_keymaster_role() => array(
+                'name'         => __( 'Keymaster', 'bbpress' ),
+                'capabilities' => bbp_get_caps_for_role( bbp_get_keymaster_role() )
+            ),
+
+            // Moderator
+            bbp_get_moderator_role() => array(
+                'name'         => __( 'Moderator', 'bbpress' ),
+                'capabilities' => bbp_get_caps_for_role( bbp_get_moderator_role() )
+            ),
+
+            // Participant
+            bbp_get_participant_role() => array(
+                'name'         => __( 'Participant', 'bbpress' ),
+                'capabilities' => bbp_get_caps_for_role( bbp_get_participant_role() )
+            ),
+
+            // Spectator
+            bbp_get_spectator_role() => array(
+                'name'         => __( 'Spectator', 'bbpress' ),
+                'capabilities' => bbp_get_caps_for_role( bbp_get_spectator_role() )
+            ),
+
+            // Blocked
+            bbp_get_blocked_role() => array(
+                'name'         => __( 'Blocked', 'bbpress' ),
+                'capabilities' => bbp_get_caps_for_role( bbp_get_blocked_role() )
+            )
+        );
+    }
+
+    // Filter & return
+    return (array) apply_filters( 'bbp_get_dynamic_roles', $bbp_roles );
 }