<!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][4646] trunk: Audit the usage of $bp-&gt;activity-&gt;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>4646</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2011-07-12 01:52:18 +0000 (Tue, 12 Jul 2011)</dd>
</dl>

<h3>Log Message</h3>
<pre>Audit the usage of $bp-&gt;activity-&gt;slug. See #3325.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivityactionsphp">trunk/bp-activity/bp-activity-actions.php</a></li>
<li><a href="#trunkbpactivitybpactivityfunctionsphp">trunk/bp-activity/bp-activity-functions.php</a></li>
<li><a href="#trunkbpactivitybpactivityscreensphp">trunk/bp-activity/bp-activity-screens.php</a></li>
<li><a href="#trunkbpactivitybpactivitytemplatephp">trunk/bp-activity/bp-activity-template.php</a></li>
<li><a href="#trunkbpactivityfeedsbpactivityfriendsfeedphp">trunk/bp-activity/feeds/bp-activity-friends-feed.php</a></li>
<li><a href="#trunkbpactivityfeedsbpactivitygroupfeedphp">trunk/bp-activity/feeds/bp-activity-group-feed.php</a></li>
<li><a href="#trunkbpactivityfeedsbpactivitypersonalfeedphp">trunk/bp-activity/feeds/bp-activity-personal-feed.php</a></li>
<li><a href="#trunkbpactivityfeedsbpactivitysitewidefeedphp">trunk/bp-activity/feeds/bp-activity-sitewide-feed.php</a></li>
<li><a href="#trunkbpgroupsbpgroupsscreensphp">trunk/bp-groups/bp-groups-screens.php</a></li>
<li><a href="#trunkbpgroupsbpgroupstemplatephp">trunk/bp-groups/bp-groups-template.php</a></li>
<li><a href="#trunkbpthemesbpdefault_incajaxphp">trunk/bp-themes/bp-default/_inc/ajax.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivitybpactivityactionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-actions.php (4645 => 4646)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-actions.php        2011-07-11 19:06:33 UTC (rev 4645)
+++ trunk/bp-activity/bp-activity-actions.php        2011-07-12 01:52:18 UTC (rev 4646)
</span><span class="lines">@@ -16,7 +16,7 @@
</span><span class="cx">         global $bp;
</span><span class="cx"> 
</span><span class="cx">         // Not viewing activity
</span><del>-        if ( ( $bp-&gt;activity-&gt;slug != bp_current_component() ) || !bp_is_current_action( 'p' ) )
</del><ins>+        if ( ( bp_is_activity_component() ) || !bp_is_current_action( 'p' ) )
</ins><span class="cx">                 return false;
</span><span class="cx"> 
</span><span class="cx">         // No activity to display
</span><span class="lines">@@ -43,20 +43,20 @@
</span><span class="cx"> 
</span><span class="cx">                 // Activity is a user update
</span><span class="cx">                 if ( !empty( $activity-&gt;user_id ) ) {
</span><del>-                        $redirect = bp_core_get_user_domain( $activity-&gt;user_id, $activity-&gt;user_nicename, $activity-&gt;user_login ) . $bp-&gt;activity-&gt;slug . '/' . $activity-&gt;id . '/';
</del><ins>+                        $redirect = bp_core_get_user_domain( $activity-&gt;user_id, $activity-&gt;user_nicename, $activity-&gt;user_login ) . bp_get_activity_slug() . '/' . $activity-&gt;id . '/';
</ins><span class="cx"> 
</span><span class="cx">                 // Activity is something else
</span><span class="cx">                 } else {
</span><span class="cx"> 
</span><span class="cx">                         // Set redirect to group activity stream
</span><span class="cx">                         if ( $group = groups_get_group( array( 'group_id' =&gt; $activity-&gt;item_id ) ) ) {
</span><del>-                                $redirect = bp_get_group_permalink( $group ) . $bp-&gt;activity-&gt;slug . '/' . $activity-&gt;id . '/';
</del><ins>+                                $redirect = bp_get_group_permalink( $group ) . bp_get_activity_slug() . '/' . $activity-&gt;id . '/';
</ins><span class="cx">                         }
</span><span class="cx">                 }
</span><span class="cx"> 
</span><span class="cx">         // Set redirect to users' activity stream
</span><span class="cx">         } else {
</span><del>-                $redirect = bp_core_get_user_domain( $activity-&gt;user_id, $activity-&gt;user_nicename, $activity-&gt;user_login ) . $bp-&gt;activity-&gt;slug . '/' . $activity-&gt;id;
</del><ins>+                $redirect = bp_core_get_user_domain( $activity-&gt;user_id, $activity-&gt;user_nicename, $activity-&gt;user_login ) . bp_get_activity_slug() . '/' . $activity-&gt;id;
</ins><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         // Allow redirect to be filtered
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx">         global $bp;
</span><span class="cx"> 
</span><span class="cx">         // Do not proceed if user is not logged in, not viewing activity, or not posting
</span><del>-        if ( !is_user_logged_in() || ( $bp-&gt;activity-&gt;slug != bp_current_component() ) || !bp_is_current_action( 'post' ) )
</del><ins>+        if ( !is_user_logged_in() || bp_is_activity_component() || !bp_is_current_action( 'post' ) )
</ins><span class="cx">                 return false;
</span><span class="cx"> 
</span><span class="cx">         // Check the nonce
</span><span class="lines">@@ -171,7 +171,7 @@
</span><span class="cx"> function bp_activity_action_post_comment() {
</span><span class="cx">         global $bp;
</span><span class="cx"> 
</span><del>-        if ( !is_user_logged_in() || ( $bp-&gt;activity-&gt;slug != bp_current_component() ) || !bp_is_current_action( 'reply' ) )
</del><ins>+        if ( !is_user_logged_in() || ( bp_is_activity_component() ) || !bp_is_current_action( 'reply' ) )
</ins><span class="cx">                 return false;
</span><span class="cx"> 
</span><span class="cx">         // Check the nonce
</span><span class="lines">@@ -203,7 +203,7 @@
</span><span class="cx"> function bp_activity_action_mark_favorite() {
</span><span class="cx">         global $bp;
</span><span class="cx"> 
</span><del>-        if ( !is_user_logged_in() || ( $bp-&gt;activity-&gt;slug != bp_current_component() ) || !bp_is_current_action( 'favorite' ) )
</del><ins>+        if ( !is_user_logged_in() || ( bp_is_activity_component() ) || !bp_is_current_action( 'favorite' ) )
</ins><span class="cx">                 return false;
</span><span class="cx"> 
</span><span class="cx">         // Check the nonce
</span><span class="lines">@@ -221,7 +221,7 @@
</span><span class="cx"> function bp_activity_action_remove_favorite() {
</span><span class="cx">         global $bp;
</span><span class="cx"> 
</span><del>-        if ( !is_user_logged_in() || ( $bp-&gt;activity-&gt;slug != bp_current_component() ) || !bp_is_current_action( 'unfavorite' ) )
</del><ins>+        if ( !is_user_logged_in() || ( bp_is_activity_component() ) || !bp_is_current_action( 'unfavorite' ) )
</ins><span class="cx">                 return false;
</span><span class="cx"> 
</span><span class="cx">         // Check the nonce
</span></span></pre></div>
<a id="trunkbpactivitybpactivityfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-functions.php (4645 => 4646)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-functions.php        2011-07-11 19:06:33 UTC (rev 4645)
+++ trunk/bp-activity/bp-activity-functions.php        2011-07-12 01:52:18 UTC (rev 4646)
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx">                 case 'new_at_mention':
</span><span class="cx">                         $activity_id      = $item_id;
</span><span class="cx">                         $poster_user_id   = $secondary_item_id;
</span><del>-                        $at_mention_link  = $bp-&gt;loggedin_user-&gt;domain . $bp-&gt;activity-&gt;slug . '/mentions/';
</del><ins>+                        $at_mention_link  = bp_displayed_user_domain() . bp_get_activity_slug() . '/mentions/';
</ins><span class="cx">                         $at_mention_title = sprintf( __( '@%s Mentions', 'buddypress' ), $bp-&gt;loggedin_user-&gt;userdata-&gt;user_nicename );
</span><span class="cx"> 
</span><span class="cx">                         if ( (int)$total_items &gt; 1 ) {
</span></span></pre></div>
<a id="trunkbpactivitybpactivityscreensphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-screens.php (4645 => 4646)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-screens.php        2011-07-11 19:06:33 UTC (rev 4645)
+++ trunk/bp-activity/bp-activity-screens.php        2011-07-12 01:52:18 UTC (rev 4646)
</span><span class="lines">@@ -146,7 +146,7 @@
</span><span class="cx">                 // Redirect based on logged in status
</span><span class="cx">                 is_user_logged_in() ?
</span><span class="cx">                         bp_core_redirect( $bp-&gt;loggedin_user-&gt;domain ) :
</span><del>-                        bp_core_redirect( site_url( 'wp-login.php?redirect_to=' . esc_url( bp_get_root_domain() . '/' . $bp-&gt;activity-&gt;slug . '/p/' . $bp-&gt;current_action ) ) );
</del><ins>+                        bp_core_redirect( site_url( 'wp-login.php?redirect_to=' . esc_url( bp_get_root_domain() . '/' . bp_get_activity_root_slug() . '/p/' . $bp-&gt;current_action ) ) );
</ins><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         bp_core_load_template( apply_filters( 'bp_activity_template_profile_activity_permalink', 'members/single/activity/permalink' ) );
</span></span></pre></div>
<a id="trunkbpactivitybpactivitytemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-template.php (4645 => 4646)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-template.php        2011-07-11 19:06:33 UTC (rev 4645)
+++ trunk/bp-activity/bp-activity-template.php        2011-07-12 01:52:18 UTC (rev 4646)
</span><span class="lines">@@ -248,7 +248,7 @@
</span><span class="cx">                 $scope = $bp-&gt;current_action;
</span><span class="cx"> 
</span><span class="cx">         // Support for permalinks on single item pages: /groups/my-group/activity/124/
</span><del>-        if ( $bp-&gt;current_action == $bp-&gt;activity-&gt;slug )
</del><ins>+        if ( bp_is_current_action( bp_get_activity_slug() ) )
</ins><span class="cx">                 $include = $bp-&gt;action_variables[0];
</span><span class="cx"> 
</span><span class="cx">         // Note: any params used for filtering can be a single value, or multiple values comma separated.
</span><span class="lines">@@ -1031,7 +1031,7 @@
</span><span class="cx">         function bp_get_activity_comment_delete_link() {
</span><span class="cx">                 global $bp;
</span><span class="cx">                 
</span><del>-                $link = wp_nonce_url( bp_get_root_domain() . '/' . $bp-&gt;activity-&gt;slug . '/delete/?cid=' . bp_get_activity_comment_id(), 'bp_activity_delete_link' );
</del><ins>+                $link = wp_nonce_url( bp_get_root_domain() . '/' . bp_get_activity_slug() . '/delete/?cid=' . bp_get_activity_comment_id(), 'bp_activity_delete_link' );
</ins><span class="cx">                 
</span><span class="cx">                 return apply_filters( 'bp_activity_comment_delete_link', $link );
</span><span class="cx">         }
</span><span class="lines">@@ -1363,7 +1363,7 @@
</span><span class="cx">                 if ( bp_is_my_profile() || !is_user_logged_in() )
</span><span class="cx">                         return false;
</span><span class="cx"> 
</span><del>-                return apply_filters( 'bp_get_send_public_message_link', wp_nonce_url( $bp-&gt;loggedin_user-&gt;domain . $bp-&gt;activity-&gt;slug . '/?r=' . bp_core_get_username( $bp-&gt;displayed_user-&gt;id, $bp-&gt;displayed_user-&gt;userdata-&gt;user_nicename, $bp-&gt;displayed_user-&gt;userdata-&gt;user_login ) ) );
</del><ins>+                return apply_filters( 'bp_get_send_public_message_link', wp_nonce_url( bp_loggedin_user_domain() . bp_get_activity_slug() . '/?r=' . bp_core_get_username( $bp-&gt;displayed_user-&gt;id, $bp-&gt;displayed_user-&gt;userdata-&gt;user_nicename, $bp-&gt;displayed_user-&gt;userdata-&gt;user_login ) ) );
</ins><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx"> function bp_mentioned_user_display_name( $user_id_or_username ) {
</span><span class="lines">@@ -1439,16 +1439,16 @@
</span><span class="cx">         function bp_get_member_activity_feed_link() {
</span><span class="cx">                 global $bp;
</span><span class="cx"> 
</span><del>-                if ( $bp-&gt;current_component == $bp-&gt;profile-&gt;slug || 'just-me' == $bp-&gt;current_action )
-                        $link = $bp-&gt;displayed_user-&gt;domain . $bp-&gt;activity-&gt;slug . '/feed/';
-                elseif ( bp_is_active( 'friends' ) &amp;&amp; $bp-&gt;friends-&gt;slug == $bp-&gt;current_action )
-                        $link = $bp-&gt;displayed_user-&gt;domain . $bp-&gt;activity-&gt;slug . '/' . $bp-&gt;friends-&gt;slug . '/feed/';
-                elseif ( bp_is_active( 'groups' ) &amp;&amp; $bp-&gt;groups-&gt;slug == $bp-&gt;current_action )
-                        $link = $bp-&gt;displayed_user-&gt;domain . $bp-&gt;activity-&gt;slug . '/' . $bp-&gt;groups-&gt;slug . '/feed/';
</del><ins>+                if ( bp_is_profile_component() || bp_is_current_action( 'just-me' ) )
+                        $link = bp_displayed_user_domain() . bp_get_activity_slug() . '/feed/';
+                elseif ( bp_is_active( 'friends' ) &amp;&amp; bp_is_current_action( bp_get_friends_slug() ) )
+                        $link = bp_displayed_user_domain() . bp_get_activity_slug() . '/' . bp_get_friends_slug() . '/feed/';
+                elseif ( bp_is_active( 'groups'  ) &amp;&amp; bp_is_current_action( bp_get_groups_slug()  ) )
+                        $link = bp_displayed_user_domain() . bp_get_activity_slug() . '/' . bp_get_groups_slug() . '/feed/';
</ins><span class="cx">                 elseif ( 'favorites' == $bp-&gt;current_action )
</span><del>-                        $link = $bp-&gt;displayed_user-&gt;domain . $bp-&gt;activity-&gt;slug . '/favorites/feed/';
</del><ins>+                        $link = bp_displayed_user_domain() . bp_get_activity_slug() . '/favorites/feed/';
</ins><span class="cx">                 elseif ( 'mentions' == $bp-&gt;current_action )
</span><del>-                        $link = $bp-&gt;displayed_user-&gt;domain . $bp-&gt;activity-&gt;slug . '/mentions/feed/';
</del><ins>+                        $link = bp_displayed_user_domain() . bp_get_activity_slug() . '/mentions/feed/';
</ins><span class="cx">                 else
</span><span class="cx">                         $link = '';
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkbpactivityfeedsbpactivityfriendsfeedphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/feeds/bp-activity-friends-feed.php (4645 => 4646)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/feeds/bp-activity-friends-feed.php        2011-07-11 19:06:33 UTC (rev 4645)
+++ trunk/bp-activity/feeds/bp-activity-friends-feed.php        2011-07-12 01:52:18 UTC (rev 4646)
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> &lt;channel&gt;
</span><span class="cx">         &lt;title&gt;&lt;?php bp_site_name() ?&gt; | &lt;?php echo $bp-&gt;displayed_user-&gt;fullname; ?&gt; | &lt;?php _e( 'Friends Activity', 'buddypress' ) ?&gt;&lt;/title&gt;
</span><span class="cx">         &lt;atom:link href=&quot;&lt;?php self_link(); ?&gt;&quot; rel=&quot;self&quot; type=&quot;application/rss+xml&quot; /&gt;
</span><del>-        &lt;link&gt;&lt;?php echo $bp-&gt;displayed_user-&gt;domain . $bp-&gt;activity-&gt;slug . '/my-friends/feed' ?&gt;&lt;/link&gt;
</del><ins>+        &lt;link&gt;&lt;?php echo bp_displayed_user_domain() . bp_get_activity_slug() . '/my-friends/feed' ?&gt;&lt;/link&gt;
</ins><span class="cx">         &lt;description&gt;&lt;?php printf( __( '%s - Friends Activity Feed', 'buddypress' ), $bp-&gt;displayed_user-&gt;fullname ) ?&gt;&lt;/description&gt;
</span><span class="cx">         &lt;pubDate&gt;&lt;?php echo mysql2date('D, d M Y H:i:s O', bp_activity_get_last_updated(), false); ?&gt;&lt;/pubDate&gt;
</span><span class="cx">         &lt;generator&gt;http://buddypress.org/?v=&lt;?php echo BP_VERSION ?&gt;&lt;/generator&gt;
</span></span></pre></div>
<a id="trunkbpactivityfeedsbpactivitygroupfeedphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/feeds/bp-activity-group-feed.php (4645 => 4646)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/feeds/bp-activity-group-feed.php        2011-07-11 19:06:33 UTC (rev 4645)
+++ trunk/bp-activity/feeds/bp-activity-group-feed.php        2011-07-12 01:52:18 UTC (rev 4646)
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> &lt;channel&gt;
</span><span class="cx">         &lt;title&gt;&lt;?php bp_site_name() ?&gt; | &lt;?php echo $bp-&gt;groups-&gt;current_group-&gt;name ?&gt; | &lt;?php _e( 'Group Activity', 'buddypress' ) ?&gt;&lt;/title&gt;
</span><span class="cx">         &lt;atom:link href=&quot;&lt;?php self_link(); ?&gt;&quot; rel=&quot;self&quot; type=&quot;application/rss+xml&quot; /&gt;
</span><del>-        &lt;link&gt;&lt;?php echo bp_get_group_permalink( $bp-&gt;groups-&gt;current_group ) . $bp-&gt;activity-&gt;slug . '/feed' ?&gt;&lt;/link&gt;
</del><ins>+        &lt;link&gt;&lt;?php echo bp_get_group_permalink( $bp-&gt;groups-&gt;current_group ) . bp_get_activity_slug() . '/feed' ?&gt;&lt;/link&gt;
</ins><span class="cx">         &lt;description&gt;&lt;?php printf( __( '%s - Group Activity Feed', 'buddypress' ), $bp-&gt;groups-&gt;current_group-&gt;name  ) ?&gt;&lt;/description&gt;
</span><span class="cx">         &lt;pubDate&gt;&lt;?php echo mysql2date('D, d M Y H:i:s O', bp_activity_get_last_updated(), false); ?&gt;&lt;/pubDate&gt;
</span><span class="cx">         &lt;generator&gt;http://buddypress.org/?v=&lt;?php echo BP_VERSION ?&gt;&lt;/generator&gt;
</span></span></pre></div>
<a id="trunkbpactivityfeedsbpactivitypersonalfeedphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/feeds/bp-activity-personal-feed.php (4645 => 4646)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/feeds/bp-activity-personal-feed.php        2011-07-11 19:06:33 UTC (rev 4645)
+++ trunk/bp-activity/feeds/bp-activity-personal-feed.php        2011-07-12 01:52:18 UTC (rev 4646)
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> &lt;channel&gt;
</span><span class="cx">         &lt;title&gt;&lt;?php bp_site_name() ?&gt; | &lt;?php echo $bp-&gt;displayed_user-&gt;fullname; ?&gt; | &lt;?php _e( 'Activity', 'buddypress' ) ?&gt;&lt;/title&gt;
</span><span class="cx">         &lt;atom:link href=&quot;&lt;?php self_link(); ?&gt;&quot; rel=&quot;self&quot; type=&quot;application/rss+xml&quot; /&gt;
</span><del>-        &lt;link&gt;&lt;?php echo $bp-&gt;displayed_user-&gt;domain . $bp-&gt;activity-&gt;slug . '/feed' ?&gt;&lt;/link&gt;
</del><ins>+        &lt;link&gt;&lt;?php echo bp_displayed_user_domain() . bp_get_activity_slug() . '/feed' ?&gt;&lt;/link&gt;
</ins><span class="cx">         &lt;description&gt;&lt;?php printf( __( '%s - Activity Feed', 'buddypress' ), $bp-&gt;displayed_user-&gt;fullname ) ?&gt;&lt;/description&gt;
</span><span class="cx">         &lt;pubDate&gt;&lt;?php echo mysql2date('D, d M Y H:i:s O', bp_activity_get_last_updated(), false); ?&gt;&lt;/pubDate&gt;
</span><span class="cx">         &lt;generator&gt;http://buddypress.org/?v=&lt;?php echo BP_VERSION ?&gt;&lt;/generator&gt;
</span></span></pre></div>
<a id="trunkbpactivityfeedsbpactivitysitewidefeedphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/feeds/bp-activity-sitewide-feed.php (4645 => 4646)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/feeds/bp-activity-sitewide-feed.php        2011-07-11 19:06:33 UTC (rev 4645)
+++ trunk/bp-activity/feeds/bp-activity-sitewide-feed.php        2011-07-12 01:52:18 UTC (rev 4646)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> &lt;channel&gt;
</span><span class="cx">         &lt;title&gt;&lt;?php bp_site_name() ?&gt; | &lt;?php _e( 'Site Wide Activity', 'buddypress' ) ?&gt;&lt;/title&gt;
</span><span class="cx">         &lt;atom:link href=&quot;&lt;?php self_link(); ?&gt;&quot; rel=&quot;self&quot; type=&quot;application/rss+xml&quot; /&gt;
</span><del>-        &lt;link&gt;&lt;?php echo site_url() . '/' . $bp-&gt;activity-&gt;slug . '/feed' ?&gt;&lt;/link&gt;
</del><ins>+        &lt;link&gt;&lt;?php echo bp_get_root_domain() . '/' . bp_get_activity_root_slug() . '/feed' ?&gt;&lt;/link&gt;
</ins><span class="cx">         &lt;description&gt;&lt;?php _e( 'Site Wide Activity Feed', 'buddypress' ) ?&gt;&lt;/description&gt;
</span><span class="cx">         &lt;pubDate&gt;&lt;?php echo mysql2date('D, d M Y H:i:s O', bp_activity_get_last_updated(), false); ?&gt;&lt;/pubDate&gt;
</span><span class="cx">         &lt;generator&gt;http://buddypress.org/?v=&lt;?php echo BP_VERSION ?&gt;&lt;/generator&gt;
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupsscreensphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-screens.php (4645 => 4646)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-screens.php        2011-07-11 19:06:33 UTC (rev 4645)
+++ trunk/bp-groups/bp-groups-screens.php        2011-07-12 01:52:18 UTC (rev 4646)
</span><span class="lines">@@ -441,7 +441,7 @@
</span><span class="cx"> function groups_screen_group_activity_permalink() {
</span><span class="cx">         global $bp;
</span><span class="cx"> 
</span><del>-        if ( !bp_is_groups_component() || !bp_is_active( 'activity' ) || ( bp_is_active( 'activity' ) &amp;&amp; !bp_is_current_action( $bp-&gt;activity-&gt;slug ) ) || empty( $bp-&gt;action_variables[0] ) )
</del><ins>+        if ( !bp_is_groups_component() || !bp_is_active( 'activity' ) || ( bp_is_active( 'activity' ) &amp;&amp; !bp_is_current_action( bp_get_activity_slug() ) ) || empty( $bp-&gt;action_variables[0] ) )
</ins><span class="cx">                 return false;
</span><span class="cx"> 
</span><span class="cx">         $bp-&gt;is_single_item = true;
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-template.php (4645 => 4646)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-template.php        2011-07-11 19:06:33 UTC (rev 4645)
+++ trunk/bp-groups/bp-groups-template.php        2011-07-12 01:52:18 UTC (rev 4646)
</span><span class="lines">@@ -677,9 +677,8 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> function bp_group_is_activity_permalink() {
</span><del>-        global $bp;
</del><span class="cx"> 
</span><del>-        if ( !bp_is_single_item() || !bp_is_current_component( 'groups' ) || !bp_is_current_action( $bp-&gt;activity-&gt;slug ) )
</del><ins>+        if ( !bp_is_single_item() || !bp_is_current_component( 'groups' ) || !bp_is_current_action( bp_get_activity_slug() ) )
</ins><span class="cx">                 return false;
</span><span class="cx"> 
</span><span class="cx">         return true;
</span><span class="lines">@@ -714,8 +713,8 @@
</span><span class="cx">         return apply_filters( 'bp_groups_auto_join', (bool)$bp-&gt;groups-&gt;auto_join );
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-function bp_group_total_members() {
-        echo bp_get_group_total_members();
</del><ins>+function bp_group_total_members( $group = false ) {
+        echo bp_get_group_total_members( $group );
</ins><span class="cx"> }
</span><span class="cx">         function bp_get_group_total_members( $group = false ) {
</span><span class="cx">                 global $groups_template;
</span></span></pre></div>
<a id="trunkbpthemesbpdefault_incajaxphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/ajax.php (4645 => 4646)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/ajax.php        2011-07-11 19:06:33 UTC (rev 4645)
+++ trunk/bp-themes/bp-default/_inc/ajax.php        2011-07-12 01:52:18 UTC (rev 4646)
</span><span class="lines">@@ -223,7 +223,7 @@
</span><span class="cx"> 
</span><span class="cx">                                         &lt;?php if ( bp_activity_user_can_delete() ) : ?&gt;
</span><span class="cx">                                                 &lt;div class=&quot;acomment-options&quot;&gt;
</span><del>-                                                        &lt;a href=&quot;&lt;?php echo wp_nonce_url( bp_get_root_domain() . '/' . $bp-&gt;activity-&gt;slug . '/delete/' . bp_get_activity_id() . '?cid=' . $comment_id, 'bp_activity_delete_link' ) ?&gt;&quot; class=&quot;delete acomment-delete confirm bp-secondary-action&quot; rel=&quot;nofollow&quot;&gt;&lt;?php _e( 'Delete', 'buddypress' ); ?&gt;&lt;/a&gt;
</del><ins>+                                                        &lt;a href=&quot;&lt;?php echo wp_nonce_url( bp_get_root_domain() . '/' . bp_get_activity_root_slug() . '/delete/' . bp_get_activity_id() . '?cid=' . $comment_id, 'bp_activity_delete_link' ) ?&gt;&quot; class=&quot;delete acomment-delete confirm bp-secondary-action&quot; rel=&quot;nofollow&quot;&gt;&lt;?php _e( 'Delete', 'buddypress' ); ?&gt;&lt;/a&gt;
</ins><span class="cx">                                                 &lt;/div&gt;
</span><span class="cx">                                         &lt;?php endif; ?&gt;
</span><span class="cx">                                 &lt;/div&gt;
</span></span></pre>
</div>
</div>

</body>
</html>