<!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] [2753] branches/1.2:
Fixed duplicate database hits when calling is_site_admin()
in a loop on single WP installs.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2753</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-02-20 12:32:00 +0000 (Sat, 20 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixed duplicate database hits when calling is_site_admin() in a loop on single WP installs. Fixed duplicate call to bp_activity_content_body() causing issues with filters.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches12bpactivitybpactivitytemplatetagsphp">branches/1.2/bp-activity/bp-activity-templatetags.php</a></li>
<li><a href="#branches12bpcorephp">branches/1.2/bp-core.php</a></li>
<li><a href="#branches12bpthemesbpdefaultactivityentryphp">branches/1.2/bp-themes/bp-default/activity/entry.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches12bpactivitybpactivitytemplatetagsphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-activity/bp-activity-templatetags.php (2752 => 2753)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-activity/bp-activity-templatetags.php 2010-02-20 00:34:32 UTC (rev 2752)
+++ branches/1.2/bp-activity/bp-activity-templatetags.php 2010-02-20 12:32:00 UTC (rev 2753)
</span><span class="lines">@@ -459,6 +459,15 @@
</span><span class="cx"> return apply_filters( 'bp_get_activity_content_body', $activities_template->activity->content, &$activities_template->activity );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ function bp_activity_has_content() {
+ global $activities_template;
+
+ if ( !empty( $activities_template->activity->content ) )
+ return true;
+
+ return false;
+ }
+
</ins><span class="cx"> function bp_activity_content() {
</span><span class="cx"> echo bp_get_activity_content();
</span><span class="cx"> }
</span><span class="lines">@@ -573,7 +582,7 @@
</span><span class="cx"> $content .= '<span class="acomment-replylink"> &middot; <a href="#acomment-' . $comment->id . '" class="acomment-reply" id="acomment-reply-' . $activities_template->activity->id . '">' . __( 'Reply', 'buddypress' ) . '</a></span>';
</span><span class="cx">
</span><span class="cx"> /* Delete link */
</span><del>- if ( is_site_admin() || $bp->loggedin_user->id == $comment->user_id )
</del><ins>+ if ( $bp->loggedin_user->is_site_admin || $bp->loggedin_user->id == $comment->user_id )
</ins><span class="cx"> $content .= ' &middot; <a href="' . wp_nonce_url( $bp->root_domain . '/' . $bp->activity->slug . '/delete/?cid=' . $comment->id, 'bp_activity_delete_link' ) . '" class="delete acomment-delete">' . __( 'Delete', 'buddypress' ) . '</a>';
</span><span class="cx">
</span><span class="cx"> $content .= '</div>';
</span></span></pre></div>
<a id="branches12bpcorephp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-core.php (2752 => 2753)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-core.php 2010-02-20 00:34:32 UTC (rev 2752)
+++ branches/1.2/bp-core.php 2010-02-20 12:32:00 UTC (rev 2753)
</span><span class="lines">@@ -106,6 +106,9 @@
</span><span class="cx"> /* The core userdata of the user who is currently logged in. */
</span><span class="cx"> $bp->loggedin_user->userdata = bp_core_get_core_userdata( $bp->loggedin_user->id );
</span><span class="cx">
</span><ins>+ /* is_site_admin() hits the DB on single WP installs, so we need to get this separately so we can call it in a loop. */
+ $bp->loggedin_user->is_site_admin = is_site_admin();
+
</ins><span class="cx"> /* The user id of the user currently being viewed, set in /bp-core/bp-core-catchuri.php */
</span><span class="cx"> $bp->displayed_user->id = $displayed_user_id;
</span><span class="cx">
</span></span></pre></div>
<a id="branches12bpthemesbpdefaultactivityentryphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-themes/bp-default/activity/entry.php (2752 => 2753)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-themes/bp-default/activity/entry.php 2010-02-20 00:34:32 UTC (rev 2752)
+++ branches/1.2/bp-themes/bp-default/activity/entry.php 2010-02-20 12:32:00 UTC (rev 2753)
</span><span class="lines">@@ -15,7 +15,7 @@
</span><span class="cx"> <?php bp_activity_action() ?>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>- <?php if ( bp_get_activity_content_body() ) : ?>
</del><ins>+ <?php if ( bp_activity_has_content() ) : ?>
</ins><span class="cx"> <div class="activity-inner">
</span><span class="cx"> <?php bp_activity_content_body() ?>
</span><span class="cx"> </div>
</span></span></pre>
</div>
</div>
</body>
</html>