<!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" />
<title>[BuddyPress][7966] trunk: Don't fetch item counts in profile navigation unnecessarily.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/7966">7966</a></dd>
<dt>Author</dt> <dd>r-a-y</dd>
<dt>Date</dt> <dd>2014-02-22 21:21:21 +0000 (Sat, 22 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't fetch item counts in profile navigation unnecessarily.
Previously, when a component's setup_nav() method is fired, the item
count for the component is fetched without any conditional checks.
This causes unneccessary queries to be fired when a user isn't logged
in or when we're not on a single user page.
This commit only fetches the item count in the profile nav if we're
currently on a single user page and/or if the current user has access
to the component nav item.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/5413">#5413</a>
Props r-a-y, boonebgorges</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpgroupsbpgroupsloaderphp">trunk/bp-groups/bp-groups-loader.php</a></li>
<li><a href="#trunkbpmessagesbpmessagesloaderphp">trunk/bp-messages/bp-messages-loader.php</a></li>
<li><a href="#trunkbpnotificationsbpnotificationsloaderphp">trunk/bp-notifications/bp-notifications-loader.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpgroupsbpgroupsloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-loader.php (7965 => 7966)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-loader.php 2014-02-22 15:50:03 UTC (rev 7965)
+++ trunk/bp-groups/bp-groups-loader.php 2014-02-22 21:21:21 UTC (rev 7966)
</span><span class="lines">@@ -346,11 +346,18 @@
</span><span class="cx"> */
</span><span class="cx"> public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
</span><span class="cx">
</span><ins>+ // Only grab count if we're on a user page
+ if ( bp_is_user() ) {
+ $count = bp_get_total_group_count_for_user();
+ $class = ( 0 === $count ) ? 'no-count' : 'count';
+ $nav_name = sprintf( __( 'Groups <span class="%s">%s</span>', 'buddypress' ), esc_attr( $class ), number_format_i18n( $count ) );
+ } else {
+ $nav_name = __( 'Groups', 'buddypress' );
+ }
+
</ins><span class="cx"> // Add 'Groups' to the main navigation
</span><del>- $count = bp_get_total_group_count_for_user();
- $class = ( 0 === $count ) ? 'no-count' : 'count';
</del><span class="cx"> $main_nav = array(
</span><del>- 'name' => sprintf( __( 'Groups <span class="%s">%s</span>', 'buddypress' ), esc_attr( $class ), number_format_i18n( $count ) ),
</del><ins>+ 'name' => $nav_name,
</ins><span class="cx"> 'slug' => $this->slug,
</span><span class="cx"> 'position' => 70,
</span><span class="cx"> 'screen_function' => 'groups_screen_my_groups',
</span></span></pre></div>
<a id="trunkbpmessagesbpmessagesloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-messages/bp-messages-loader.php (7965 => 7966)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-messages/bp-messages-loader.php 2014-02-22 15:50:03 UTC (rev 7965)
+++ trunk/bp-messages/bp-messages-loader.php 2014-02-22 21:21:21 UTC (rev 7966)
</span><span class="lines">@@ -102,11 +102,18 @@
</span><span class="cx"> */
</span><span class="cx"> public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
</span><span class="cx">
</span><ins>+ // Only grab count if we're on a user page and current user has access
+ if ( bp_is_user() && bp_user_has_access() ) {
+ $count = bp_get_total_unread_messages_count();
+ $class = ( 0 === $count ) ? 'no-count' : 'count';
+ $nav_name = sprintf( __( 'Messages <span class="%s">%s</span>', 'buddypress' ), esc_attr( $class ), number_format_i18n( $count ) );
+ } else {
+ $nav_name = __( 'Messages', 'buddypress' );
+ }
+
</ins><span class="cx"> // Add 'Messages' to the main navigation
</span><del>- $count = bp_get_total_unread_messages_count();
- $class = ( 0 === $count ) ? 'no-count' : 'count';
</del><span class="cx"> $main_nav = array(
</span><del>- 'name' => sprintf( __( 'Messages <span class="%s">%s</span>', 'buddypress' ), esc_attr( $class ), number_format_i18n( $count ) ),
</del><ins>+ 'name' => $nav_name,
</ins><span class="cx"> 'slug' => $this->slug,
</span><span class="cx"> 'position' => 50,
</span><span class="cx"> 'show_for_displayed_user' => false,
</span></span></pre></div>
<a id="trunkbpnotificationsbpnotificationsloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-notifications/bp-notifications-loader.php (7965 => 7966)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-notifications/bp-notifications-loader.php 2014-02-22 15:50:03 UTC (rev 7965)
+++ trunk/bp-notifications/bp-notifications-loader.php 2014-02-22 21:21:21 UTC (rev 7966)
</span><span class="lines">@@ -104,11 +104,18 @@
</span><span class="cx"> */
</span><span class="cx"> public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
</span><span class="cx">
</span><ins>+ // Only grab count if we're on a user page and current user has access
+ if ( bp_is_user() && bp_user_has_access() ) {
+ $count = bp_notifications_get_unread_notification_count( bp_displayed_user_id() );
+ $class = ( 0 === $count ) ? 'no-count' : 'count';
+ $nav_name = sprintf( __( 'Notifications <span class="%s">%s</span>', 'buddypress' ), esc_attr( $class ), number_format_i18n( $count ) );
+ } else {
+ $nav_name = __( 'Notifications', 'buddypress' );
+ }
+
</ins><span class="cx"> // Add 'Notifications' to the main navigation
</span><del>- $count = bp_notifications_get_unread_notification_count( bp_displayed_user_id() );
- $class = ( 0 === $count ) ? 'no-count' : 'count';
</del><span class="cx"> $main_nav = array(
</span><del>- 'name' => sprintf( __( 'Notifications <span class="%s">%s</span>', 'buddypress' ), esc_attr( $class ), number_format_i18n( $count ) ),
</del><ins>+ 'name' => $nav_name,
</ins><span class="cx"> 'slug' => $this->slug,
</span><span class="cx"> 'position' => 30,
</span><span class="cx"> 'show_for_displayed_user' => bp_core_can_edit_settings(),
</span></span></pre>
</div>
</div>
</body>
</html>