<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[BuddyPress] [2456] trunk/bp-activity/bp-activity-templatetags.php:
  Reducing query count for activity stream by moving incorrectly repeated database calls from inside the loop
 .</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd>2456</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-01-26 13:15:09 +0000 (Tue, 26 Jan 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>Reducing query count for activity stream by moving incorrectly repeated database calls from inside the loop.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivitytemplatetagsphp">trunk/bp-activity/bp-activity-templatetags.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivitybpactivitytemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-templatetags.php (2455 => 2456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-templatetags.php        2010-01-26 12:32:30 UTC (rev 2455)
+++ trunk/bp-activity/bp-activity-templatetags.php        2010-01-26 13:15:09 UTC (rev 2456)
</span><span class="lines">@@ -21,6 +21,12 @@
</span><span class="cx">                 $this-&gt;pag_page = isset( $_REQUEST['acpage'] ) ? intval( $_REQUEST['acpage'] ) : $page;
</span><span class="cx">                 $this-&gt;pag_num = isset( $_REQUEST['num'] ) ? intval( $_REQUEST['num'] ) : $per_page;
</span><span class="cx"> 
</span><ins>+                /* Check if blog/forum replies are disabled */
+                $this-&gt;disable_blogforum_replies = get_site_option( 'bp-disable-blogforum-comments' );
+
+                /* Get an array of the logged in user's favorite activities */
+                $this-&gt;my_favs = maybe_unserialize( get_usermeta( $bp-&gt;loggedin_user-&gt;id, 'bp_favorite_activities' ) );
+
</ins><span class="cx">                 if ( !empty( $include ) ) {
</span><span class="cx">                         /* Fetch specific activity items based on ID's */
</span><span class="cx">                         $this-&gt;activities = bp_activity_get_specific( array( 'activity_ids' =&gt; explode( ',', $include ), 'max' =&gt; $max, 'page' =&gt; $this-&gt;pag_page, 'per_page' =&gt; $this-&gt;pag_num, 'sort' =&gt; $sort, 'display_comments' =&gt; $display_comments ) );
</span><span class="lines">@@ -453,9 +459,7 @@
</span><span class="cx">         function bp_get_activity_is_favorite() {
</span><span class="cx">                 global $bp, $activities_template;
</span><span class="cx"> 
</span><del>-                $my_favs = maybe_unserialize( get_usermeta( $bp-&gt;loggedin_user-&gt;id, 'bp_favorite_activities' ) );
-
-                 return apply_filters( 'bp_get_activity_is_favorite', in_array( $activities_template-&gt;activity-&gt;id, (array)$my_favs ) );
</del><ins>+                 return apply_filters( 'bp_get_activity_is_favorite', in_array( $activities_template-&gt;activity-&gt;id, (array)$activities_template-&gt;my_favs ) );
</ins><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx"> function bp_activity_comments( $args = '' ) {
</span><span class="lines">@@ -684,9 +688,9 @@
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx"> function bp_activity_can_comment() {
</span><del>-        global $bp;
</del><ins>+        global $activities_template, $bp;
</ins><span class="cx"> 
</span><del>-        if ( false === get_site_option( 'bp-disable-blogforum-comments' ) || (int)get_site_option( 'bp-disable-blogforum-comments' ) ) {
</del><ins>+        if ( false === $activities_template-&gt;disable_blogforum_replies || (int)$activities_template-&gt;disable_blogforum_replies ) {
</ins><span class="cx">                 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() )
</span><span class="cx">                         return false;
</span><span class="cx">         }
</span></span></pre>
</div>
</div>

</body>
</html>