<!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][3930] trunk: Set first tabs on members and forums directories to the component 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>3930</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2011-01-25 23:18:23 +0000 (Tue, 25 Jan 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Set first tabs on members and forums directories to the component root slug. Add supporting member_slug functions. Add proper empty() check to current_group is_member.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpgroupsbpgroupsfiltersphp">trunk/bp-groups/bp-groups-filters.php</a></li>
<li><a href="#trunkbpmembersbpmemberstemplatephp">trunk/bp-members/bp-members-template.php</a></li>
<li><a href="#trunkbpthemesbpdefaultforumsindexphp">trunk/bp-themes/bp-default/forums/index.php</a></li>
<li><a href="#trunkbpthemesbpdefaultmembersindexphp">trunk/bp-themes/bp-default/members/index.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpgroupsbpgroupsfiltersphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-filters.php (3929 => 3930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-filters.php 2011-01-25 22:53:55 UTC (rev 3929)
+++ trunk/bp-groups/bp-groups-filters.php 2011-01-25 23:18:23 UTC (rev 3930)
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> if ( bp_is_forums_component() ||
</span><span class="cx"> ( !empty( $bp->groups->current_group ) &&
</span><span class="cx"> ( 'public' == $bp->groups->current_group->status ) ||
</span><del>- ( 1 == $bp->groups->current_group->is_member ) ) ) {
</del><ins>+ ( !empty( $bp->groups->current_group->is_member ) ) ) ) {
</ins><span class="cx">
</span><span class="cx"> add_filter( 'get_topics_fields', 'groups_add_forum_fields_sql' );
</span><span class="cx"> add_filter( 'get_topics_index_hint', 'groups_add_forum_tables_sql' );
</span></span></pre></div>
<a id="trunkbpmembersbpmemberstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-members/bp-members-template.php (3929 => 3930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-members/bp-members-template.php 2011-01-25 22:53:55 UTC (rev 3929)
+++ trunk/bp-members/bp-members-template.php 2011-01-25 23:18:23 UTC (rev 3930)
</span><span class="lines">@@ -1,6 +1,53 @@
</span><span class="cx"> <?php
</span><span class="cx">
</span><ins>+/**
+ * Output the members component slug
+ *
+ * @package BuddyPress
+ * @subpackage Members Template
+ * @since BuddyPress {unknown}
+ *
+ * @uses bp_get_members_slug()
+ */
+function bp_members_slug() {
+ echo bp_get_members_slug();
+}
+ /**
+ * Return the members component slug
+ *
+ * @package BuddyPress
+ * @subpackage Members Template
+ * @since BuddyPress {unknown}
+ */
+ function bp_get_members_slug() {
+ global $bp;
+ return apply_filters( 'bp_get_members_slug', $bp->members->slug );
+ }
</ins><span class="cx">
</span><ins>+/**
+ * Output the members component root slug
+ *
+ * @package BuddyPress
+ * @subpackage Members Template
+ * @since BuddyPress {unknown}
+ *
+ * @uses bp_get_members_root_slug()
+ */
+function bp_members_root_slug() {
+ echo bp_get_members_root_slug();
+}
+ /**
+ * Return the members component root slug
+ *
+ * @package BuddyPress
+ * @subpackage Members Template
+ * @since BuddyPress {unknown}
+ */
+ function bp_get_members_root_slug() {
+ global $bp;
+ return apply_filters( 'bp_get_members_root_slug', $bp->members->root_slug );
+ }
+
</ins><span class="cx"> /***
</span><span class="cx"> * Members template loop that will allow you to loop all members or friends of a member
</span><span class="cx"> * if you pass a user_id.
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultforumsindexphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/forums/index.php (3929 => 3930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/forums/index.php 2011-01-25 22:53:55 UTC (rev 3929)
+++ trunk/bp-themes/bp-default/forums/index.php 2011-01-25 23:18:23 UTC (rev 3930)
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx">
</span><span class="cx"> <form action="" method="post" id="forums-search-form" class="dir-form">
</span><span class="cx">
</span><del>- <h3><?php _e( 'Group Forums Directory', 'buddypress' ); ?><?php if ( is_user_logged_in() ) : ?> &nbsp;<a class="button" href="#new-topic" id="new-topic-button"><?php _e( 'New Topic', 'buddypress' ); ?></a><?php endif; ?></h3>
</del><ins>+ <h3><?php _e( 'Group Forums Directory', 'buddypress' ); ?><?php if ( is_user_logged_in() ) : ?> &nbsp;<a class="button show-hide-new" href="#new-topic" id="new-topic-button"><?php _e( 'New Topic', 'buddypress' ); ?></a><?php endif; ?></h3>
</ins><span class="cx">
</span><span class="cx"> <div id="forums-dir-search" class="dir-search" role="search">
</span><span class="cx">
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx">
</span><span class="cx"> <div class="item-list-tabs" role="navigation">
</span><span class="cx"> <ul>
</span><del>- <li class="selected" id="forums-all"><a href="<?php bp_root_domain(); ?>"><?php printf( __( 'All Topics (%s)', 'buddypress' ), bp_get_forum_topic_count() ); ?></a></li>
</del><ins>+ <li class="selected" id="forums-all"><a href="<?php echo trailingslashit( bp_get_root_domain() . '/' . bp_get_forums_root_slug() ); ?>"><?php printf( __( 'All Topics (%s)', 'buddypress' ), bp_get_forum_topic_count() ); ?></a></li>
</ins><span class="cx">
</span><span class="cx"> <?php if ( is_user_logged_in() && bp_get_forum_topic_count_for_user( bp_loggedin_user_id() ) ) : ?>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultmembersindexphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/members/index.php (3929 => 3930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/members/index.php 2011-01-25 22:53:55 UTC (rev 3929)
+++ trunk/bp-themes/bp-default/members/index.php 2011-01-25 23:18:23 UTC (rev 3930)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> <div class="item-list-tabs" role="navigation">
</span><span class="cx"> <ul>
</span><del>- <li class="selected" id="members-all"><a href="<?php bp_root_domain(); ?>"><?php printf( __( 'All Members (%s)', 'buddypress' ), bp_get_total_member_count() ); ?></a></li>
</del><ins>+ <li class="selected" id="members-all"><a href="<?php echo trailingslashit( bp_get_root_domain() . '/' . bp_get_members_root_slug() ); ?>"><?php printf( __( 'All Members (%s)', 'buddypress' ), bp_get_total_member_count() ); ?></a></li>
</ins><span class="cx">
</span><span class="cx"> <?php if ( is_user_logged_in() && bp_is_active( 'friends' ) && bp_get_total_friend_count( bp_loggedin_user_id() ) ) : ?>
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>