<!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] [2641] trunk: Fixes #1789</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2641</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-02-10 12:29:59 +0000 (Wed, 10 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes #1789</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpforumsbpforumstemplatetagsphp">trunk/bp-forums/bp-forums-templatetags.php</a></li>
<li><a href="#trunkbpforumsphp">trunk/bp-forums.php</a></li>
<li><a href="#trunkbpthemesbpdefault_incglobaljs">trunk/bp-themes/bp-default/_inc/global.js</a></li>
<li><a href="#trunkbpthemesbpdefaultfunctionsphp">trunk/bp-themes/bp-default/functions.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 (2640 => 2641)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-forums/bp-forums-templatetags.php 2010-02-09 20:18:43 UTC (rev 2640)
+++ trunk/bp-forums/bp-forums-templatetags.php 2010-02-10 12:29:59 UTC (rev 2641)
</span><span class="lines">@@ -39,8 +39,8 @@
</span><span class="cx"> $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 ) );
</span><span class="cx"> break;
</span><span class="cx">
</span><del>- case 'tag':
- $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 ) );
</del><ins>+ case 'tags':
+ $this->topics = bp_forums_get_forum_topics( array( 'user_id' => $user_id, 'type' => 'tags', '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">@@ -177,12 +177,6 @@
</span><span class="cx"> $forum_id = $bp->groups->current_group->forum_id;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- /* If we're viewing a tag in the directory, let's auto set the filter to the tag name */
- if ( 'tag' == $bp->current_action && !empty( $bp->action_variables[0] ) ) {
- $search_terms = $bp->action_variables[0];
- $type = 'tags';
- }
-
</del><span class="cx"> /* If $_GET['fs'] is set, let's auto populate the search_terms var */
</span><span class="cx"> if ( $bp->is_directory && !empty( $_GET['fs'] ) )
</span><span class="cx"> $search_terms = $_GET['fs'];
</span><span class="lines">@@ -205,6 +199,12 @@
</span><span class="cx"> $r = wp_parse_args( $args, $defaults );
</span><span class="cx"> extract( $r );
</span><span class="cx">
</span><ins>+ /* If we're viewing a tag URL in the directory, let's override the type and set it to tags and the filter to the tag name */
+ if ( 'tag' == $bp->current_action && !empty( $bp->action_variables[0] ) ) {
+ $search_terms = $bp->action_variables[0];
+ $type = 'tags';
+ }
+
</ins><span class="cx"> $forum_template = new BP_Forums_Template_Forum( $type, $forum_id, $user_id, $page, $per_page, $max, $no_stickies, $search_terms );
</span><span class="cx"> return apply_filters( 'bp_has_topics', $forum_template->has_topics(), &$forum_template );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbpforumsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-forums.php (2640 => 2641)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-forums.php 2010-02-09 20:18:43 UTC (rev 2640)
+++ trunk/bp-forums.php 2010-02-10 12:29:59 UTC (rev 2641)
</span><span class="lines">@@ -164,7 +164,7 @@
</span><span class="cx"> $topics =& $query->results;
</span><span class="cx"> break;
</span><span class="cx">
</span><del>- case 'tag':
</del><ins>+ case 'tags':
</ins><span class="cx"> $query = new BB_Query( 'topic', array( 'forum_id' => $forum_id, 'topic_author_id' => $user_id, 'tag' => $filter, 'per_page' => $per_page, 'page' => $page, 'order_by' => 't.topic_time', 'sticky' => $show_stickies ) );
</span><span class="cx"> $topics =& $query->results;
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkbpthemesbpdefault_incglobaljs"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/global.js (2640 => 2641)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/global.js 2010-02-09 20:18:43 UTC (rev 2640)
+++ trunk/bp-themes/bp-default/_inc/global.js 2010-02-10 12:29:59 UTC (rev 2641)
</span><span class="lines">@@ -596,7 +596,7 @@
</span><span class="cx">
</span><span class="cx"> /* Clicking a forum tag */
</span><span class="cx"> j('div#forum-directory-tags a').click( function() {
</span><del>- bp_filter_request( 'forums', 'tags', j.cookie('bp-forums-scope'), 'div.forums', j(this).html(), 1, j.cookie('bp-forums-extras') );
</del><ins>+ bp_filter_request( 'forums', 'tags', j.cookie('bp-forums-scope'), 'div.forums', j(this).html().replace( /&nbsp;/g, '-' ), 1, j.cookie('bp-forums-extras') );
</ins><span class="cx"> return false;
</span><span class="cx"> });
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/functions.php (2640 => 2641)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/functions.php 2010-02-09 20:18:43 UTC (rev 2640)
+++ trunk/bp-themes/bp-default/functions.php 2010-02-10 12:29:59 UTC (rev 2641)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> <li id="comment-<?php comment_ID(); ?>">
</span><span class="cx"> <div class="comment-avatar-box">
</span><span class="cx"> <div class="avb">
</span><del>- <a href="<?php echo get_comment_author_url() ?>">
</del><ins>+ <a href="<?php echo get_comment_author_url() ?>" rel="nofollow">
</ins><span class="cx"> <?php if ( $comment->user_id ) : ?>
</span><span class="cx"> <?php echo bp_core_fetch_avatar( array( 'item_id' => $comment->user_id, 'width' => 50, 'height' => 50, 'email' => $comment->comment_author_email ) ); ?>
</span><span class="cx"> <?php else : ?>
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> <div class="comment-content">
</span><span class="cx">
</span><span class="cx"> <div class="comment-meta">
</span><del>- <a href="<?php echo get_comment_author_url() ?>"><?php echo get_comment_author(); ?></a> <?php _e( 'said:', 'buddypress' ) ?>
</del><ins>+ <a href="<?php echo get_comment_author_url() ?>" rel="nofollow"><?php echo get_comment_author(); ?></a> <?php _e( 'said:', 'buddypress' ) ?>
</ins><span class="cx"> <em><?php _e( 'On', 'buddypress' ) ?> <a href="#comment-<?php comment_ID() ?>" title=""><?php comment_date() ?></a></em>
</span><span class="cx"> </div>
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>