Changeset 2456 for trunk/bp-activity/bp-activity-templatetags.php

Timestamp:

01/26/2010 01:15:09 PM (17 years ago)

Author:

apeatling

Message:

Reducing query count for activity stream by moving incorrectly repeated database calls from inside the loop.

File:

• trunk/bp-activity/bp-activity-templatetags.php (modified) (3 diffs)

trunk/bp-activity/bp-activity-templatetags.php

@@ -21 +21 @@
                 $this->pag_page = isset( $_REQUEST['acpage'] ) ? intval( $_REQUEST['acpage'] ) : $page;
                 $this->pag_num = isset( $_REQUEST['num'] ) ? intval( $_REQUEST['num'] ) : $per_page;
+
+                /* Check if blog/forum replies are disabled */
+                $this->disable_blogforum_replies = get_site_option( 'bp-disable-blogforum-comments' );
+
+                /* Get an array of the logged in user's favorite activities */
+                $this->my_favs = maybe_unserialize( get_usermeta( $bp->loggedin_user->id, 'bp_favorite_activities' ) );
 
                 if ( !empty( $include ) ) {
@@ -454 +460 @@
                 global $bp, $activities_template;
 
-                $my_favs = maybe_unserialize( get_usermeta( $bp->loggedin_user->id, 'bp_favorite_activities' ) );
-
-                return apply_filters( 'bp_get_activity_is_favorite', in_array( $activities_template->activity->id, (array)$my_favs ) );
+                return apply_filters( 'bp_get_activity_is_favorite', in_array( $activities_template->activity->id, (array)$activities_template->my_favs ) );
         }
 
@@ -685 +689 @@
 
 function bp_activity_can_comment() {
-        global $bp;
-
-        if ( false === get_site_option( 'bp-disable-blogforum-comments' ) || (int)get_site_option( 'bp-disable-blogforum-comments' ) ) {
+        global $activities_template, $bp;
+
+        if ( false === $activities_template->disable_blogforum_replies || (int)$activities_template->disable_blogforum_replies ) {
                 if ( 'new_blog_post' == bp_get_activity_action_name() || 'new_blog_comment' == bp_get_activity_action_name() || 'new_forum_topic' == bp_get_activity_action_name() || 'new_forum_post' == bp_get_activity_action_name() )
                         return false;