Changeset 4910

Timestamp:

05/15/2013 05:39:17 PM (13 years ago)

Author:

johnjamesjacoby

Message:

When activating bbPress, conditionally make the current user a Key Master, but only if they can already activate plugins, they are already a member of the current site, and they're not already a Key Master. Fixes activation issues some users experienced with old global access settings being turned off, preventing them from seeing bbPress configuration screens. (trunk)

Location:

trunk/includes

Files:

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

trunk/includes/admin/actions.php

@@ -64 +64 @@
 
 // Activation
-add_action( 'bbp_activation', 'bbp_delete_rewrite_rules'    );
+add_action( 'bbp_activation', 'bbp_delete_rewrite_rules'        );
+add_action( 'bbp_activation', 'bbp_make_current_user_keymaster' );
 
 // Deactivation

trunk/includes/core/update.php

@@ -302 +302 @@
     set_transient( '_bbp_activation_redirect', true, 30 );
 }
+
+/**
+ * Hooked to the 'bbp_activate' action, this helper function automatically makes
+ * the current user a Key Master in the forums if they just activated bbPress,
+ * regardless of the bbp_allow_global_access() setting.
+ *
+ * @since bbPress (r4910)
+ *
+ * @internal Used to internally make the current user a keymaster on activation
+ *
+ * @uses current_user_can() to bail if user cannot activate plugins
+ * @uses get_current_user_id() to get the current user ID
+ * @uses get_current_blog_id() to get the current blog ID
+ * @uses is_user_member_of_blog() to bail if the current user does not have a role
+ * @uses bbp_is_user_keymaster() to bail if the user is already a keymaster
+ * @uses bbp_set_user_role() to make the current user a keymaster
+ *
+ * @return If user can't activate plugins or is already a keymaster
+ */
+function bbp_make_current_user_keymaster() {
+
+        // Bail if the current user can't activate plugins since previous pageload
+        if ( ! current_user_can( 'activate_plugins' ) )
+                return;
+
+        // Get the current user ID
+        $user_id = get_current_user_id();
+        $blog_id = get_current_blog_id();
+
+        // Bail if user is not actually a member of this site
+        if ( ! is_user_member_of_blog( $user_id, $blog_id ) )
+                return;
+
+        // Bail if the current user is already a keymaster
+        if ( bbp_is_user_keymaster( $user_id ) )
+                return;
+
+        // Make the current user a keymaster
+        bbp_set_user_role( $user_id, bbp_get_keymaster_role() );
+}