<!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] [2594] trunk/bp-forums/bp-forums-templatetags.php: Fixes #1803</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2594</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-02-04 16:32:35 +0000 (Thu, 04 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes #1803</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpforumsbpforumstemplatetagsphp">trunk/bp-forums/bp-forums-templatetags.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpforumsbpforumstemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-forums/bp-forums-templatetags.php (2593 => 2594)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-forums/bp-forums-templatetags.php 2010-02-04 16:03:16 UTC (rev 2593)
+++ trunk/bp-forums/bp-forums-templatetags.php 2010-02-04 16:32:35 UTC (rev 2594)
</span><span class="lines">@@ -26,25 +26,21 @@
</span><span class="cx"> $this->type = $type;
</span><span class="cx"> $this->search_terms = $search_terms;
</span><span class="cx">
</span><del>- /* Only show stickies if we are viewing a single group forum, otherwise we could end up with hundreds globally */
- if ( $no_stickies )
- $show_stickies = 'all'; // bbPress needs str 'no'
-
</del><span class="cx"> switch ( $type ) {
</span><span class="cx"> case 'newest': default:
</span><del>- $this->topics = bp_forums_get_forum_topics( array( 'user_id' => $user_id, 'forum_id' => $forum_id, 'filter' => $search_terms, 'page' => $this->pag_page, 'per_page' => $this->pag_num, 'show_stickies' => $show_stickies ) );
</del><ins>+ $this->topics = bp_forums_get_forum_topics( array( 'user_id' => $user_id, 'forum_id' => $forum_id, 'filter' => $search_terms, 'page' => $this->pag_page, 'per_page' => $this->pag_num, 'show_stickies' => $no_stickies ) );
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case 'popular':
</span><del>- $this->topics = bp_forums_get_forum_topics( array( 'user_id' => $user_id, 'type' => 'popular', 'filter' => $search_terms, 'forum_id' => $forum_id, 'page' => $this->pag_page, 'per_page' => $this->pag_num, 'show_stickies' => $show_stickies ) );
</del><ins>+ $this->topics = bp_forums_get_forum_topics( array( 'user_id' => $user_id, 'type' => 'popular', 'filter' => $search_terms, 'forum_id' => $forum_id, 'page' => $this->pag_page, 'per_page' => $this->pag_num, 'show_stickies' => $no_stickies ) );
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case 'unreplied':
</span><del>- $this->topics = bp_forums_get_forum_topics( array( 'user_id' => $user_id, 'type' => 'unreplied', 'filter' => $search_terms, 'forum_id' => $forum_id, 'page' => $this->pag_page, 'per_page' => $this->pag_num, 'show_stickies' => $show_stickies ) );
</del><ins>+ $this->topics = bp_forums_get_forum_topics( array( 'user_id' => $user_id, 'type' => 'unreplied', 'filter' => $search_terms, 'forum_id' => $forum_id, 'page' => $this->pag_page, 'per_page' => $this->pag_num, 'show_stickies' => $no_stickies ) );
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case 'tag':
</span><del>- $this->topics = bp_forums_get_forum_topics( array( 'user_id' => $user_id, 'type' => 'tag', 'filter' => $search_terms, 'forum_id' => $forum_id, 'page' => $this->pag_page, 'per_page' => $this->pag_num, 'show_stickies' => $show_stickies ) );
</del><ins>+ $this->topics = bp_forums_get_forum_topics( array( 'user_id' => $user_id, 'type' => 'tag', 'filter' => $search_terms, 'forum_id' => $forum_id, 'page' => $this->pag_page, 'per_page' => $this->pag_num, 'show_stickies' => $no_stickies ) );
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -164,7 +160,7 @@
</span><span class="cx"> $user_id = false;
</span><span class="cx"> $forum_id = false;
</span><span class="cx"> $search_terms = false;
</span><del>- $no_stickies = false;
</del><ins>+ $no_stickies = 'all';
</ins><span class="cx">
</span><span class="cx"> /* User filtering */
</span><span class="cx"> if ( !empty( $bp->displayed_user->id ) )
</span><span class="lines">@@ -191,9 +187,9 @@
</span><span class="cx"> if ( $bp->is_directory && !empty( $_GET['fs'] ) )
</span><span class="cx"> $search_terms = $_GET['fs'];
</span><span class="cx">
</span><del>- /* Don't show stickies on the directory page, otherwise we might end up with 100's */
- if ( $bp->is_directory )
- $no_stickies = true;
</del><ins>+ /* Show stickies on a group forum */
+ if ( $bp->groups->current_group )
+ $no_stickies = null;
</ins><span class="cx">
</span><span class="cx"> $defaults = array(
</span><span class="cx"> 'type' => $type,
</span></span></pre>
</div>
</div>
</body>
</html>