<!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][5129] trunk/bp-forums: Reworks the way that total topic counts are retrieved on user forum pages.</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, #logmsg > ol { margin-left: 0; 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/5129">5129</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2011-09-09 15:06:13 +0000 (Fri, 09 Sep 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Reworks the way that total topic counts are retrieved on user forum pages. See <a href="http://buddypress.trac.wordpress.org/ticket/3557">#3557</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpforumsbpforumsfiltersphp">trunk/bp-forums/bp-forums-filters.php</a></li>
<li><a href="#trunkbpforumsbpforumsfunctionsphp">trunk/bp-forums/bp-forums-functions.php</a></li>
<li><a href="#trunkbpforumsbpforumstemplatephp">trunk/bp-forums/bp-forums-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpforumsbpforumsfiltersphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-forums/bp-forums-filters.php (5128 => 5129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-forums/bp-forums-filters.php 2011-09-08 13:31:05 UTC (rev 5128)
+++ trunk/bp-forums/bp-forums-filters.php 2011-09-09 15:06:13 UTC (rev 5129)
</span><span class="lines">@@ -200,6 +200,9 @@
</span><span class="cx">
</span><span class="cx"> $sql .= $wpdb->prepare( " AND p.poster_id = %s ", bp_displayed_user_id() );
</span><span class="cx">
</span><ins>+ // Remove any topic_author information
+ $sql = str_replace( " AND t.topic_poster = '" . bp_displayed_user_id() . "'", '', $sql );
+
</ins><span class="cx"> return $sql;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpforumsbpforumsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-forums/bp-forums-functions.php (5128 => 5129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-forums/bp-forums-functions.php 2011-09-08 13:31:05 UTC (rev 5128)
+++ trunk/bp-forums/bp-forums-functions.php 2011-09-09 15:06:13 UTC (rev 5129)
</span><span class="lines">@@ -290,7 +290,16 @@
</span><span class="cx"> return apply_filters( 'bp_forums_total_topic_count', $count );
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function bp_forums_total_topic_count_for_user( $user_id = 0 ) {
</del><ins>+/**
+ * Get a total "Topics Started" count for a given user
+ *
+ * @package BuddyPress
+ *
+ * @param int $user_id ID of the user being queried. Falls back on displayed user, then loggedin
+ * @param str $type The current filter/sort type. 'active', 'popular', 'unreplied'
+ * @return int $count The topic count
+ */
+function bp_forums_total_topic_count_for_user( $user_id = 0, $type = 'active' ) {
</ins><span class="cx"> global $bp;
</span><span class="cx">
</span><span class="cx"> do_action( 'bbpress_init' );
</span><span class="lines">@@ -299,7 +308,17 @@
</span><span class="cx"> $user_id = ( $bp->displayed_user->id ) ? $bp->displayed_user->id : $bp->loggedin_user->id;
</span><span class="cx">
</span><span class="cx"> if ( class_exists( 'BB_Query' ) ) {
</span><del>- $query = new BB_Query( 'topic', array( 'topic_author_id' => $user_id, 'page' => 1, 'per_page' => -1, 'count' => true ) );
</del><ins>+ $args = array(
+ 'topic_author_id' => $user_id,
+ 'page' => 1,
+ 'per_page' => -1,
+ 'count' => true
+ );
+
+ if ( 'unreplied' == $type )
+ $args['post_count'] = 1;
+
+ $query = new BB_Query( 'topic', $args );
</ins><span class="cx"> $count = $query->count;
</span><span class="cx"> $query = null;
</span><span class="cx"> } else {
</span><span class="lines">@@ -320,7 +339,7 @@
</span><span class="cx"> * @param int $user_id Defaults to displayed user, then to logged-in user
</span><span class="cx"> * @return int $count
</span><span class="cx"> */
</span><del>-function bp_forums_total_replied_count_for_user( $user_id = 0 ) {
</del><ins>+function bp_forums_total_replied_count_for_user( $user_id = 0, $type = 'active' ) {
</ins><span class="cx"> global $bp;
</span><span class="cx">
</span><span class="cx"> do_action( 'bbpress_init' );
</span><span class="lines">@@ -340,7 +359,15 @@
</span><span class="cx"> if ( !in_array( $result->topic_id, $topics ) )
</span><span class="cx"> $topics[] = $result->topic_id;
</span><span class="cx"> }
</span><del>- $count = count( $topics );
</del><ins>+
+ // Even more unfortunate. If this is filtered by 'unreplied', we have to requery
+ if ( 'unreplied' == $type ) {
+ $topic_ids = implode( ',', $topics );
+ $topics_query = new BB_Query( 'topic', array( 'topic_id' => $topic_ids, 'page' => 1, 'per_page' => -1, 'post_count' => 1 ) );
+ $count = count( $topics_query->results );
+ } else {
+ $count = count( $topics );
+ }
</ins><span class="cx"> $query = null;
</span><span class="cx"> } else {
</span><span class="cx"> $count = 0;
</span></span></pre></div>
<a id="trunkbpforumsbpforumstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-forums/bp-forums-template.php (5128 => 5129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-forums/bp-forums-template.php 2011-09-08 13:31:05 UTC (rev 5128)
+++ trunk/bp-forums/bp-forums-template.php 2011-09-09 15:06:13 UTC (rev 5129)
</span><span class="lines">@@ -136,17 +136,23 @@
</span><span class="cx"> $this->topic_count = 0;
</span><span class="cx"> $this->total_topic_count = 0;
</span><span class="cx"> } else {
</span><ins>+ // Get a total topic count, for use in pagination. This value will differ
+ // depending on scope
</ins><span class="cx"> if ( !empty( $forum_id ) ) {
</span><ins>+ // Group forums
</ins><span class="cx"> $topic_count = bp_forums_get_forum( $forum_id );
</span><span class="cx"> $topic_count = (int)$topic_count->topics;
</span><span class="cx"> } else if ( !empty( $bp->groups->current_group ) ) {
</span><span class="cx"> $topic_count = (int)groups_total_public_forum_topic_count( $type );
</span><del>- } else if ( bp_is_user_forums_started() ) {
- $topic_count = bp_forums_total_topic_count_for_user( bp_displayed_user_id() );
</del><ins>+ } else if ( bp_is_user_forums_started() || ( bp_is_directory() && $user_id ) ) {
+ // This covers the case of Profile > Forums > Topics Started, as
+ // well as Forum Directory > My Topics
+ $topic_count = bp_forums_total_topic_count_for_user( bp_displayed_user_id(), $type );
</ins><span class="cx"> } else if ( bp_is_user_forums_replied_to() ) {
</span><del>- $topic_count = bp_forums_total_replied_count_for_user( bp_displayed_user_id() );
</del><ins>+ // Profile > Forums > Replied To
+ $topic_count = bp_forums_total_replied_count_for_user( bp_displayed_user_id(), $type );
</ins><span class="cx"> } else {
</span><del>- // For forum directories, get a true count
</del><ins>+ // For forum directories (All Topics), get a true count
</ins><span class="cx"> $status = is_super_admin() ? 'all' : 'public'; // todo: member-of
</span><span class="cx"> $topic_count = (int)groups_total_forum_topic_count( $status, $search_terms );
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>