Changeset 6439

Timestamp:

05/27/2017 05:35:23 PM (7 years ago)

Author:

johnjamesjacoby

Message:

Engagements: Remove bbp_get_topic() checks from engagements.

See #3083.

File:

• trunk/src/includes/users/engagements.php (modified) (6 diffs)

trunk/src/includes/users/engagements.php

@@ -209 +209 @@
  * Add a topic to user's engagements
  *
+ * Note that both the User and Topic should be verified to exist before using
+ * this function. Originally both were validated, but because this function is
+ * frequently used within a loop, those verifications were moved upstream to
+ * improve performance on topics with many engaged users.
+ *
  * @since 2.6.0 bbPress (r6320)
  *
@@ -221 +226 @@
     // Bail if not enough info
     if ( empty( $user_id ) || empty( $topic_id ) ) {
-        return false;
-    }
-
-    // Bail if no topic
-    $topic = bbp_get_topic( $topic_id );
-    if ( empty( $topic ) ) {
         return false;
     }
@@ -407 +406 @@
  * Add a topic to user's favorites
  *
+ * Note that both the User and Topic should be verified to exist before using
+ * this function. Originally both were validated, but because this function is
+ * frequently used within a loop, those verifications were moved upstream to
+ * improve performance on topics with many engaged users.
+ *
  * @since 2.0.0 bbPress (r2652)
  *
@@ -419 +423 @@
     // Bail if not enough info
     if ( empty( $user_id ) || empty( $topic_id ) ) {
-        return false;
-    }
-
-    // Bail if no topic
-    $topic = bbp_get_topic( $topic_id );
-    if ( empty( $topic ) ) {
         return false;
     }
@@ -1005 +1003 @@
  * Add a topic to user's subscriptions
  *
+ * Note that both the User and Topic should be verified to exist before using
+ * this function. Originally both were validated, but because this function is
+ * frequently used within a loop, those verifications were moved upstream to
+ * improve performance on topics with many engaged users.
+ *
  * @since 2.0.0 bbPress (r2668)
  *
  * @param int $user_id Optional. User id
  * @param int $topic_id Optional. Topic id
- * @uses bbp_get_topic() To get the topic
  * @uses bbp_add_user_subscription() To add the subscription
  * @uses do_action() Calls 'bbp_add_user_subscription' with the user & topic id
@@ -1018 +1020 @@
     // Bail if not enough info
     if ( empty( $user_id ) || empty( $topic_id ) ) {
-        return false;
-    }
-
-    // Bail if no topic
-    $topic = bbp_get_topic( $topic_id );
-    if ( empty( $topic ) ) {
         return false;
     }