Changeset 6407

Timestamp:

04/27/2017 05:18:35 AM (8 years ago)

Author:

johnjamesjacoby

Message:

Moderators: Another performance optimization in bbp_is_user_forum_moderator().

Use bbp_is_object_of_user() directly, and clean-up local variable reassignments.

Location:

trunk/src/includes

Files:

• forums/capabilities.php (modified) (2 diffs)
• users/functions.php (modified) (2 diffs)

trunk/src/includes/forums/capabilities.php

@@ -239 +239 @@
  * @uses bbp_get_user_id()
  * @uses bbp_get_forum_id()
- * @uses bbp_get_moderator_forum_ids()
+ * @uses bbp_is_object_of_user()
  * @uses apply_filters() Calls 'bbp_is_user_forum_moderator' with the forums
  *
@@ -246 +246 @@
 function bbp_is_user_forum_moderator( $user_id = 0, $forum_id = 0 ) {
 
-    // Assume user cannot moderate the forum.
-    $retval    = false;
-
     // Validate user ID - fallback to current user if no ID passed.
-    $user_id   = bbp_get_user_id( $user_id, false, ! empty( $user_id ) );
-    $forum_id  = bbp_get_forum_id( $forum_id );
-    $forum_ids = array();
-
-    // Only check if per-forum moderation is enabled
-    if ( bbp_allow_forum_mods() ) {
-
-        // Get users who can moderate this forum.
-        $user_ids = bbp_get_moderator_ids( $forum_id );
-
-        // Is this user ID in the users array?
-        if ( ! empty( $user_ids ) ) {
-            $retval = in_array( $user_id, $user_ids, true );
-        }
-    }
-
-    return (bool) apply_filters( 'bbp_is_user_forum_moderator', $retval, $user_id, $forum_id, $forum_ids );
-}
+    $user_id  = bbp_get_user_id( $user_id, false, ! empty( $user_id ) );
+    $forum_id = bbp_get_forum_id( $forum_id );
+
+    // Check if per-forum moderation is enabled, or assume false
+    $retval = bbp_allow_forum_mods()
+        ? bbp_is_object_of_user( $forum_id, $user_id, '_bbp_moderator_id' )
+        : false;
+
+    // Filter & return
+    return (bool) apply_filters( 'bbp_is_user_forum_moderator', $retval, $user_id, $forum_id );
+}

trunk/src/includes/users/functions.php

@@ -197 +197 @@
  * @param string $meta_type The relationship type
  *
- * @uses bbp_is_object_of_user() To check if the term has already been set
  * @uses add_post_meta() To set the term on the object
  * @uses apply_filters() Calls 'bbp_add_user_to_object' with the object id, user
@@ -220 +219 @@
  * @param string $meta_type The relationship type
  *
- * @uses bbp_is_object_of_user() To check if the term is set
  * @uses delete_post_meta() To remove the term from the object
  * @uses apply_filters() Calls 'bbp_remove_user_from_object' with the object