<!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][4652] trunk: Audit the usage of $bp->forums->slug and $bp->forums->root_slug.</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>4652</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2011-07-12 03:29:12 +0000 (Tue, 12 Jul 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Audit the usage of $bp->forums->slug and $bp->forums->root_slug. See #3325.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcorefunctionsphp">trunk/bp-core/bp-core-functions.php</a></li>
<li><a href="#trunkbpforumsbpforumsfiltersphp">trunk/bp-forums/bp-forums-filters.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="trunkbpcorebpcorefunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-functions.php (4651 => 4652)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-functions.php 2011-07-12 03:14:14 UTC (rev 4651)
+++ trunk/bp-core/bp-core-functions.php 2011-07-12 03:29:12 UTC (rev 4652)
</span><span class="lines">@@ -831,7 +831,7 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case 'forums':
</span><del>- $slug = bp_is_active( 'forums' ) ? $bp->forums->root_slug : '';
</del><ins>+ $slug = bp_is_active( 'forums' ) ? bp_get_groups_root_slug() : '';
</ins><span class="cx"> $query_string = '/?fs=';
</span><span class="cx"> break;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpforumsbpforumsfiltersphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-forums/bp-forums-filters.php (4651 => 4652)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-forums/bp-forums-filters.php 2011-07-12 03:14:14 UTC (rev 4651)
+++ trunk/bp-forums/bp-forums-filters.php 2011-07-12 03:29:12 UTC (rev 4652)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> function bp_forums_filter_tag_link( $link, $tag, $page, $context ) {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><del>- return apply_filters( 'bp_forums_filter_tag_link', bp_get_root_domain() . '/' . $bp->forums->root_slug . '/tag/' . $tag . '/' );
</del><ins>+ return apply_filters( 'bp_forums_filter_tag_link', bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/tag/' . $tag . '/' );
</ins><span class="cx"> }
</span><span class="cx"> add_filter( 'bb_get_tag_link', 'bp_forums_filter_tag_link', 10, 4);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpforumsbpforumstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-forums/bp-forums-template.php (4651 => 4652)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-forums/bp-forums-template.php 2011-07-12 03:14:14 UTC (rev 4651)
+++ trunk/bp-forums/bp-forums-template.php 2011-07-12 03:29:12 UTC (rev 4652)
</span><span class="lines">@@ -688,7 +688,7 @@
</span><span class="cx"> function bp_get_my_forum_topics_link() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><del>- return apply_filters( 'bp_get_my_forum_topics_link', bp_get_root_domain() . '/' . $bp->forums->slug . '/personal/' );
</del><ins>+ return apply_filters( 'bp_get_my_forum_topics_link', bp_get_root_domain() . '/' . bp_get_forums_root_slug() . '/personal/' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_unreplied_forum_topics_link() {
</span><span class="lines">@@ -697,7 +697,7 @@
</span><span class="cx"> function bp_get_unreplied_forum_topics_link() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><del>- return apply_filters( 'bp_get_unreplied_forum_topics_link', bp_get_root_domain() . '/' . $bp->forums->slug . '/unreplied/' );
</del><ins>+ return apply_filters( 'bp_get_unreplied_forum_topics_link', bp_get_root_domain() . '/' . bp_get_forums_root_slug() . '/unreplied/' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -707,7 +707,7 @@
</span><span class="cx"> function bp_get_popular_forum_topics_link() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><del>- return apply_filters( 'bp_get_popular_forum_topics_link', bp_get_root_domain() . '/' . $bp->forums->slug . '/popular/' );
</del><ins>+ return apply_filters( 'bp_get_popular_forum_topics_link', bp_get_root_domain() . '/' . bp_get_forums_root_slug() . '/popular/' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_newest_forum_topics_link() {
</span><span class="lines">@@ -716,7 +716,7 @@
</span><span class="cx"> function bp_get_newest_forum_topics_link() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><del>- return apply_filters( 'bp_get_newest_forum_topics_link', bp_get_root_domain() . '/' . $bp->forums->slug . '/' );
</del><ins>+ return apply_filters( 'bp_get_newest_forum_topics_link', bp_get_root_domain() . '/' . bp_get_forums_root_slug() . '/' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_forum_topic_type() {
</span><span class="lines">@@ -725,11 +725,10 @@
</span><span class="cx"> function bp_get_forum_topic_type() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><del>- if ( !bp_is_directory() || !$bp->current_action )
</del><ins>+ if ( !bp_is_directory() || !bp_current_action() )
</ins><span class="cx"> return 'newest';
</span><span class="cx">
</span><del>-
- return apply_filters( 'bp_get_forum_topic_type', $bp->current_action );
</del><ins>+ return apply_filters( 'bp_get_forum_topic_type', bp_current_action() );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_forums_tag_name() {
</span><span class="lines">@@ -738,8 +737,12 @@
</span><span class="cx"> function bp_get_forums_tag_name() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><del>- if ( bp_is_directory() && $bp->forums->slug == $bp->current_component )
- return apply_filters( 'bp_get_forums_tag_name', $bp->action_variables[0] );
</del><ins>+ if ( bp_is_directory() && bp_is_forums_component() && !empty( $bp->action_variables[0] ) )
+ $tag_name = $bp->action_variables[0];
+ else
+ $tag_name = false;
+
+ return apply_filters( 'bp_get_forums_tag_name', $tag_name );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_forum_pagination() {
</span><span class="lines">@@ -1176,7 +1179,7 @@
</span><span class="cx"> function bp_get_forum_directory_permalink() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><del>- return apply_filters( 'bp_get_forum_directory_permalink', trailingslashit( bp_get_root_domain() . '/' . $bp->forums->root_slug ) );
</del><ins>+ return apply_filters( 'bp_get_forum_directory_permalink', trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_forums_tag_heat_map( $args = '' ) {
</span></span></pre>
</div>
</div>
</body>
</html>