<!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][3841] trunk: Clean up phpDoc in Groups slug functions.</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>3841</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2011-01-22 16:10:42 +0000 (Sat, 22 Jan 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clean up phpDoc in Groups slug functions. Add Friends and Forums slug functions.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpforumsbpforumstemplatephp">trunk/bp-forums/bp-forums-template.php</a></li>
<li><a href="#trunkbpfriendsbpfriendstemplatephp">trunk/bp-friends/bp-friends-template.php</a></li>
<li><a href="#trunkbpgroupsbpgroupstemplatephp">trunk/bp-groups/bp-groups-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpforumsbpforumstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-forums/bp-forums-template.php (3840 => 3841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-forums/bp-forums-template.php 2011-01-22 16:02:37 UTC (rev 3840)
+++ trunk/bp-forums/bp-forums-template.php 2011-01-22 16:10:42 UTC (rev 3841)
</span><span class="lines">@@ -1,5 +1,53 @@
</span><span class="cx"> <?php
</span><span class="cx">
</span><ins>+/**
+ * Output the forums component slug
+ *
+ * @package BuddyPress
+ * @subpackage Forums Template
+ * @since BuddyPress {unknown}
+ *
+ * @uses bp_get_forums_slug()
+ */
+function bp_forums_slug() {
+ echo bp_get_forums_slug();
+}
+ /**
+ * Return the forums component slug
+ *
+ * @package BuddyPress
+ * @subpackage Forums Template
+ * @since BuddyPress {unknown}
+ */
+ function bp_get_forums_slug() {
+ global $bp;
+ return apply_filters( 'bp_get_forums_slug', $bp->forums->slug );
+ }
+
+/**
+ * Output the forums component root slug
+ *
+ * @package BuddyPress
+ * @subpackage Forums Template
+ * @since BuddyPress {unknown}
+ *
+ * @uses bp_get_forums_root_slug()
+ */
+function bp_forums_root_slug() {
+ echo bp_get_forums_root_slug();
+}
+ /**
+ * Return the forums component root slug
+ *
+ * @package BuddyPress
+ * @subpackage Forums Template
+ * @since BuddyPress {unknown}
+ */
+ function bp_get_forums_root_slug() {
+ global $bp;
+ return apply_filters( 'bp_get_forums_root_slug', $bp->forums->root_slug );
+ }
+
</ins><span class="cx"> class BP_Forums_Template_Forum {
</span><span class="cx"> var $current_topic = -1;
</span><span class="cx"> var $topic_count;
</span></span></pre></div>
<a id="trunkbpfriendsbpfriendstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-friends/bp-friends-template.php (3840 => 3841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-friends/bp-friends-template.php 2011-01-22 16:02:37 UTC (rev 3840)
+++ trunk/bp-friends/bp-friends-template.php 2011-01-22 16:10:42 UTC (rev 3841)
</span><span class="lines">@@ -1,11 +1,60 @@
</span><span class="cx"> <?php
</span><span class="cx">
</span><ins>+/**
+ * Output the friends component slug
+ *
+ * @package BuddyPress
+ * @subpackage Friends Template
+ * @since BuddyPress {unknown}
+ *
+ * @uses bp_get_friends_slug()
+ */
+function bp_friends_slug() {
+ echo bp_get_friends_slug();
+}
+ /**
+ * Return the friends component slug
+ *
+ * @package BuddyPress
+ * @subpackage Friends Template
+ * @since BuddyPress {unknown}
+ */
+ function bp_get_friends_slug() {
+ global $bp;
+ return apply_filters( 'bp_get_friends_slug', $bp->friends->slug );
+ }
+
+/**
+ * Output the friends component root slug
+ *
+ * @package BuddyPress
+ * @subpackage Friends Template
+ * @since BuddyPress {unknown}
+ *
+ * @uses bp_get_friends_root_slug()
+ */
+function bp_friends_root_slug() {
+ echo bp_get_friends_root_slug();
+}
+ /**
+ * Return the friends component root slug
+ *
+ * @package BuddyPress
+ * @subpackage Friends Template
+ * @since BuddyPress {unknown}
+ */
+ function bp_get_friends_root_slug() {
+ global $bp;
+ return apply_filters( 'bp_get_friends_root_slug', $bp->friends->root_slug );
+ }
+
</ins><span class="cx"> function bp_friends_header_tabs() {
</span><del>- global $bp;
-?>
</del><ins>+ global $bp; ?>
+
</ins><span class="cx"> <li<?php if ( !isset($bp->action_variables[0]) || 'recently-active' == $bp->action_variables[0] ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->friends->slug ?>/my-friends/recently-active"><?php _e( 'Recently Active', 'buddypress' ) ?></a></li>
</span><span class="cx"> <li<?php if ( 'newest' == $bp->action_variables[0] ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->friends->slug ?>/my-friends/newest"><?php _e( 'Newest', 'buddypress' ) ?></a></li>
</span><span class="cx"> <li<?php if ( 'alphabetically' == $bp->action_variables[0] ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->friends->slug ?>/my-friends/alphabetically""><?php _e( 'Alphabetically', 'buddypress' ) ?></a></li>
</span><ins>+
</ins><span class="cx"> <?php
</span><span class="cx"> do_action( 'friends_header_tabs' );
</span><span class="cx"> }
</span><span class="lines">@@ -24,7 +73,7 @@
</span><span class="cx"> break;
</span><span class="cx"> case 'alphabetically':
</span><span class="cx"> _e( 'Alphabetically', 'buddypress' );
</span><del>- break;
</del><ins>+ break;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -34,24 +83,32 @@
</span><span class="cx"> if ( !$friend_ids = wp_cache_get( 'friends_friend_ids_' . $bp->displayed_user->id, 'bp' ) ) {
</span><span class="cx"> $friend_ids = BP_Friends_Friendship::get_random_friends( $bp->displayed_user->id );
</span><span class="cx"> wp_cache_set( 'friends_friend_ids_' . $bp->displayed_user->id, $friend_ids, 'bp' );
</span><del>- }
-?>
</del><ins>+ } ?>
+
</ins><span class="cx"> <div class="info-group">
</span><span class="cx"> <h4><?php bp_word_or_name( __( "My Friends", 'buddypress' ), __( "%s's Friends", 'buddypress' ) ) ?> (<?php echo BP_Friends_Friendship::total_friend_count( $bp->displayed_user->id ) ?>) <span><a href="<?php echo $bp->displayed_user->domain . $bp->friends->slug ?>"><?php _e('See All', 'buddypress') ?> &rarr;</a></span></h4>
</span><span class="cx">
</span><span class="cx"> <?php if ( $friend_ids ) { ?>
</span><ins>+
</ins><span class="cx"> <ul class="horiz-gallery">
</span><ins>+
</ins><span class="cx"> <?php for ( $i = 0; $i < count( $friend_ids ); $i++ ) { ?>
</span><ins>+
</ins><span class="cx"> <li>
</span><span class="cx"> <a href="<?php echo bp_core_get_user_domain( $friend_ids[$i] ) ?>"><?php echo bp_core_fetch_avatar( array( 'item_id' => $friend_ids[$i], 'type' => 'thumb' ) ) ?></a>
</span><span class="cx"> <h5><?php echo bp_core_get_userlink($friend_ids[$i]) ?></h5>
</span><span class="cx"> </li>
</span><ins>+
</ins><span class="cx"> <?php } ?>
</span><ins>+
</ins><span class="cx"> </ul>
</span><ins>+
</ins><span class="cx"> <?php } else { ?>
</span><ins>+
</ins><span class="cx"> <div id="message" class="info">
</span><span class="cx"> <p><?php bp_word_or_name( __( "You haven't added any friend connections yet.", 'buddypress' ), __( "%s hasn't created any friend connections yet.", 'buddypress' ) ) ?></p>
</span><span class="cx"> </div>
</span><ins>+
</ins><span class="cx"> <?php } ?>
</span><span class="cx"> <div class="clear"></div>
</span><span class="cx"> </div>
</span><span class="lines">@@ -64,34 +121,52 @@
</span><span class="cx"> if ( !$user_ids = wp_cache_get( 'friends_random_users', 'bp' ) ) {
</span><span class="cx"> $user_ids = BP_Core_User::get_users( 'random', $total_members );
</span><span class="cx"> wp_cache_set( 'friends_random_users', $user_ids, 'bp' );
</span><del>- }
-?>
</del><ins>+ } ?>
+
</ins><span class="cx"> <?php if ( $user_ids['users'] ) { ?>
</span><ins>+
</ins><span class="cx"> <ul class="item-list" id="random-members-list">
</span><ins>+
</ins><span class="cx"> <?php for ( $i = 0; $i < count( $user_ids['users'] ); $i++ ) { ?>
</span><ins>+
</ins><span class="cx"> <li>
</span><span class="cx"> <a href="<?php echo bp_core_get_user_domain( $user_ids['users'][$i]->user_id ) ?>"><?php echo bp_core_fetch_avatar( array( 'item_id' => $user_ids['users'][$i]->user_id, 'type' => 'thumb' ) ) ?></a>
</span><span class="cx"> <h5><?php echo bp_core_get_userlink( $user_ids['users'][$i]->user_id ) ?></h5>
</span><ins>+
</ins><span class="cx"> <?php if ( function_exists( 'xprofile_get_random_profile_data' ) ) { ?>
</span><ins>+
</ins><span class="cx"> <?php $random_data = xprofile_get_random_profile_data( $user_ids['users'][$i]->user_id, true ); ?>
</span><ins>+
</ins><span class="cx"> <div class="profile-data">
</span><span class="cx"> <p class="field-name"><?php echo $random_data[0]->name ?></p>
</span><ins>+
</ins><span class="cx"> <?php echo $random_data[0]->value ?>
</span><ins>+
</ins><span class="cx"> </div>
</span><ins>+
</ins><span class="cx"> <?php } ?>
</span><span class="cx">
</span><span class="cx"> <div class="action">
</span><ins>+
</ins><span class="cx"> <?php if ( function_exists( 'bp_add_friend_button' ) ) { ?>
</span><ins>+
</ins><span class="cx"> <?php bp_add_friend_button( $user_ids['users'][$i]->user_id ) ?>
</span><ins>+
</ins><span class="cx"> <?php } ?>
</span><ins>+
</ins><span class="cx"> </div>
</span><span class="cx"> </li>
</span><ins>+
</ins><span class="cx"> <?php } ?>
</span><ins>+
</ins><span class="cx"> </ul>
</span><ins>+
</ins><span class="cx"> <?php } else { ?>
</span><ins>+
</ins><span class="cx"> <div id="message" class="info">
</span><span class="cx"> <p><?php _e( "There aren't enough site members to show a random sample just yet.", 'buddypress' ) ?></p>
</span><span class="cx"> </div>
</span><ins>+
</ins><span class="cx"> <?php } ?>
</span><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="lines">@@ -100,17 +175,19 @@
</span><span class="cx"> global $friends_template, $bp;
</span><span class="cx">
</span><span class="cx"> $action = $bp->displayed_user->domain . $bp->friends->slug . '/my-friends/search/';
</span><del>- $label = __( 'Filter Friends', 'buddypress' );
- ?>
</del><ins>+ $label = __( 'Filter Friends', 'buddypress' ); ?>
+
</ins><span class="cx"> <form action="<?php echo $action ?>" id="friend-search-form" method="post">
</span><span class="cx">
</span><span class="cx"> <label for="friend-search-box" id="friend-search-label"><?php echo $label ?></label>
</span><span class="cx"> <input type="search" name="friend-search-box" id="friend-search-box" value="<?php echo $value ?>"<?php echo $disabled ?> />
</span><span class="cx">
</span><span class="cx"> <?php wp_nonce_field( 'friends_search', '_wpnonce_friend_search' ) ?>
</span><ins>+
</ins><span class="cx"> <input type="hidden" name="initiator" id="initiator" value="<?php echo esc_attr( $bp->displayed_user->id ) ?>" />
</span><span class="cx">
</span><span class="cx"> </form>
</span><ins>+
</ins><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -345,4 +422,5 @@
</span><span class="cx">
</span><span class="cx"> return apply_filters( 'bp_friend_get_total_requests_count', count( BP_Friends_Friendship::get_friend_user_ids( $user_id, true ) ) );
</span><span class="cx"> }
</span><del>-?>
</del><span class="cx">\ No newline at end of file
</span><ins>+
+?>
</ins></span></pre></div>
<a id="trunkbpgroupsbpgroupstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-template.php (3840 => 3841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-template.php 2011-01-22 16:02:37 UTC (rev 3840)
+++ trunk/bp-groups/bp-groups-template.php 2011-01-22 16:10:42 UTC (rev 3841)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> * Output the groups component slug
</span><span class="cx"> *
</span><span class="cx"> * @package BuddyPress
</span><del>- * @subpackage Activity Template
</del><ins>+ * @subpackage Groups Template
</ins><span class="cx"> * @since BuddyPress {unknown}
</span><span class="cx"> *
</span><span class="cx"> * @uses bp_get_groups_slug()
</span><span class="lines">@@ -16,7 +16,7 @@
</span><span class="cx"> * Return the groups component slug
</span><span class="cx"> *
</span><span class="cx"> * @package BuddyPress
</span><del>- * @subpackage Activity Template
</del><ins>+ * @subpackage Groups Template
</ins><span class="cx"> * @since BuddyPress {unknown}
</span><span class="cx"> */
</span><span class="cx"> function bp_get_groups_slug() {
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> * Output the groups component root slug
</span><span class="cx"> *
</span><span class="cx"> * @package BuddyPress
</span><del>- * @subpackage Activity Template
</del><ins>+ * @subpackage Groups Template
</ins><span class="cx"> * @since BuddyPress {unknown}
</span><span class="cx"> *
</span><span class="cx"> * @uses bp_get_groups_root_slug()
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> * Return the groups component root slug
</span><span class="cx"> *
</span><span class="cx"> * @package BuddyPress
</span><del>- * @subpackage Activity Template
</del><ins>+ * @subpackage Groups Template
</ins><span class="cx"> * @since BuddyPress {unknown}
</span><span class="cx"> */
</span><span class="cx"> function bp_get_groups_root_slug() {
</span></span></pre>
</div>
</div>
</body>
</html>