Changeset 6118 for trunk/src/bbpress.php

Timestamp:

11/09/2016 09:51:11 PM (9 years ago)

Author:

johnjamesjacoby

Message:

Roles: Fix infinite loops from load order changes in WordPress 4.7.

• Do not translate "role names" which are actually role IDs
• Add dummy function so literal role names are part of the pomo dictionary
• Introduce common/locale.php for future localization code
• Introduce roles variable to main bbPress class, and store loaded roles there
• Introduce bbp_translate_user_role() to help with outputting literal role names in the proper language

See #3017. For trunk (2.6)

File:

• trunk/src/bbpress.php (modified) (6 diffs)

trunk/src/bbpress.php

@@ -67 +67 @@
      * @var array Topic views
      */
-    public $views        = array();
+    public $views = array();
 
     /**
      * @var array Overloads get_option()
      */
-    public $options      = array();
+    public $options = array();
 
     /**
@@ -78 +78 @@
      */
     public $user_options = array();
+
+    /**
+     * @var array Dynamically initialized user roles
+     */
+    public $roles = array();
 
     /** Singleton *************************************************************/
@@ -316 +321 @@
         require $this->includes_dir . 'common/functions.php';
         require $this->includes_dir . 'common/formatting.php';
+        require $this->includes_dir . 'common/locale.php';
         require $this->includes_dir . 'common/template.php';
         require $this->includes_dir . 'common/widgets.php';
@@ -383 +389 @@
             'setup_theme',              // Setup the default theme compat
             'setup_current_user',       // Setup currently logged in user
+            'roles_init',               // User roles init
             'register_post_types',      // Register post types (forum|topic|reply)
             'register_post_statuses',   // Register post statuses (closed|spam|orphan|hidden)
@@ -745 +752 @@
      * Setup the currently logged-in user
      *
-     * Do not to call this prematurely, I.E. before the 'init' action has
-     * started. This function is naturally hooked into 'init' to ensure proper
-     * execution. get_currentuserinfo() is used to check for XMLRPC_REQUEST to
-     * avoid xmlrpc errors.
-     *
      * @since 2.0.0 bbPress (r2697)
      *
@@ -756 +758 @@
     public function setup_current_user() {
         $this->current_user = wp_get_current_user();
+    }
+
+    /**
+     * Initialize forum-specific roles
+     *
+     * @since 2.6.0
+     */
+    public function roles_init() {
+
+        // Get role IDs
+        $keymaster   = bbp_get_keymaster_role();
+        $moderator   = bbp_get_moderator_role();
+        $participant = bbp_get_participant_role();
+        $spectator   = bbp_get_spectator_role();
+        $blocked     = bbp_get_blocked_role();
+
+        // Build the roles into one useful array
+        $this->roles[ $keymaster   ] = new WP_Role( 'Keymaster',   bbp_get_caps_for_role( $keymaster   ) );
+        $this->roles[ $moderator   ] = new WP_Role( 'Moderator',   bbp_get_caps_for_role( $moderator   ) );
+        $this->roles[ $participant ] = new WP_Role( 'Participant', bbp_get_caps_for_role( $participant ) );
+        $this->roles[ $spectator   ] = new WP_Role( 'Spectator',   bbp_get_caps_for_role( $spectator   ) );
+        $this->roles[ $blocked     ] = new WP_Role( 'Blocked',     bbp_get_caps_for_role( $blocked     ) );
     }