<!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][4638] trunk: Cleans up use of BP_x_SLUG, replacing with wrapper functions where possible</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>4638</dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2011-07-09 22:58:18 +0000 (Sat, 09 Jul 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Cleans up use of BP_x_SLUG, replacing with wrapper functions where possible</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivitynotificationsphp">trunk/bp-activity/bp-activity-notifications.php</a></li>
<li><a href="#trunkbpcorebpcorecatchuriphp">trunk/bp-core/bp-core-catchuri.php</a></li>
<li><a href="#trunkbpcorebpcorefunctionsphp">trunk/bp-core/bp-core-functions.php</a></li>
<li><a href="#trunkbpcorebpcoretemplatephp">trunk/bp-core/bp-core-template.php</a></li>
<li><a href="#trunkbpfriendsbpfriendsnotificationsphp">trunk/bp-friends/bp-friends-notifications.php</a></li>
<li><a href="#trunkbpgroupsbpgroupsnotificationsphp">trunk/bp-groups/bp-groups-notifications.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="#trunkbpmembersbpmemberstemplatephp">trunk/bp-members/bp-members-template.php</a></li>
<li><a href="#trunkbpmessagesbpmessagesnotificationsphp">trunk/bp-messages/bp-messages-notifications.php</a></li>
<li><a href="#trunkbpmessagesbpmessagestemplatephp">trunk/bp-messages/bp-messages-template.php</a></li>
<li><a href="#trunkbpthemesbpdefaultblogsindexphp">trunk/bp-themes/bp-default/blogs/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="trunkbpactivitybpactivitynotificationsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-notifications.php (4637 => 4638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-notifications.php 2011-07-09 22:36:13 UTC (rev 4637)
+++ trunk/bp-activity/bp-activity-notifications.php 2011-07-09 22:58:18 UTC (rev 4638)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> $poster_name = bp_core_get_user_displayname( $poster_user_id );
</span><span class="cx">
</span><span class="cx"> $message_link = bp_activity_get_permalink( $activity_id );
</span><del>- $settings_link = bp_core_get_user_domain( $receiver_user_id ) . BP_SETTINGS_SLUG . '/notifications/';
</del><ins>+ $settings_link = bp_core_get_user_domain( $receiver_user_id ) . bp_get_settings_slug() . '/notifications/';
</ins><span class="cx">
</span><span class="cx"> $poster_name = stripslashes( $poster_name );
</span><span class="cx"> $content = bp_activity_filter_kses( stripslashes($content) );
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx"> if ( $original_activity->user_id != $commenter_id && 'no' != bp_get_user_meta( $original_activity->user_id, 'notification_activity_new_reply', true ) ) {
</span><span class="cx"> $poster_name = bp_core_get_user_displayname( $commenter_id );
</span><span class="cx"> $thread_link = bp_activity_get_permalink( $activity_id );
</span><del>- $settings_link = bp_core_get_user_domain( $original_activity->user_id ) . BP_SETTINGS_SLUG . '/notifications/';
</del><ins>+ $settings_link = bp_core_get_user_domain( $original_activity->user_id ) . bp_get_settings_slug() . '/notifications/';
</ins><span class="cx">
</span><span class="cx"> $poster_name = stripslashes( $poster_name );
</span><span class="cx"> $content = bp_activity_filter_kses( stripslashes($content) );
</span><span class="lines">@@ -129,7 +129,7 @@
</span><span class="cx"> if ( $parent_comment->user_id != $commenter_id && $original_activity->user_id != $parent_comment->user_id && 'no' != bp_get_user_meta( $parent_comment->user_id, 'notification_activity_new_reply', true ) ) {
</span><span class="cx"> $poster_name = bp_core_get_user_displayname( $commenter_id );
</span><span class="cx"> $thread_link = bp_activity_get_permalink( $activity_id );
</span><del>- $settings_link = bp_core_get_user_domain( $parent_comment->user_id ) . BP_SETTINGS_SLUG . '/notifications/';
</del><ins>+ $settings_link = bp_core_get_user_domain( $parent_comment->user_id ) . bp_get_settings_slug() . '/notifications/';
</ins><span class="cx">
</span><span class="cx"> // Set up and send the message
</span><span class="cx"> $ud = bp_core_get_core_userdata( $parent_comment->user_id );
</span></span></pre></div>
<a id="trunkbpcorebpcorecatchuriphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-catchuri.php (4637 => 4638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-catchuri.php 2011-07-09 22:36:13 UTC (rev 4637)
+++ trunk/bp-core/bp-core-catchuri.php 2011-07-09 22:58:18 UTC (rev 4638)
</span><span class="lines">@@ -197,11 +197,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Search doesn't have an associated page, so we check for it separately
</span><del>- if ( !empty( $bp_uri[0] ) && ( BP_SEARCH_SLUG == $bp_uri[0] ) ) {
</del><ins>+ if ( !empty( $bp_uri[0] ) && ( bp_get_search_slug() == $bp_uri[0] ) ) {
</ins><span class="cx"> $matches[] = 1;
</span><span class="cx"> $match = new stdClass;
</span><span class="cx"> $match->key = 'search';
</span><del>- $match->slug = BP_SEARCH_SLUG;
</del><ins>+ $match->slug = bp_get_search_slug();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // This is not a BuddyPress page, so just return.
</span></span></pre></div>
<a id="trunkbpcorebpcorefunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-functions.php (4637 => 4638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-functions.php 2011-07-09 22:36:13 UTC (rev 4637)
+++ trunk/bp-core/bp-core-functions.php 2011-07-09 22:58:18 UTC (rev 4638)
</span><span class="lines">@@ -807,7 +807,7 @@
</span><span class="cx"> function bp_core_action_search_site( $slug = '' ) {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><del>- if ( BP_SEARCH_SLUG != $bp->current_component )
</del><ins>+ if ( !bp_is_current_component( bp_get_search_slug() ) )
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if ( empty( $_POST['search-terms'] ) ) {
</span></span></pre></div>
<a id="trunkbpcorebpcoretemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-template.php (4637 => 4638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-template.php 2011-07-09 22:36:13 UTC (rev 4637)
+++ trunk/bp-core/bp-core-template.php 2011-07-09 22:58:18 UTC (rev 4638)
</span><span class="lines">@@ -221,9 +221,7 @@
</span><span class="cx"> /** Search Form ***************************************************************/
</span><span class="cx">
</span><span class="cx"> function bp_search_form_action() {
</span><del>- global $bp;
-
- return apply_filters( 'bp_search_form_action', bp_get_root_domain() . '/' . BP_SEARCH_SLUG );
</del><ins>+ return apply_filters( 'bp_search_form_action', bp_get_root_domain() . '/' . bp_get_search_slug() );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -593,6 +591,29 @@
</span><span class="cx"> return apply_filters( 'bp_user_has_access', $has_access );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * Output the search slug
+ *
+ * @package BuddyPress
+ * @since 1.3
+ *
+ * @uses bp_get_search_slug()
+ */
+function bp_search_slug() {
+ echo bp_get_search_slug();
+}
+ /**
+ * Return the search slug
+ *
+ * @package BuddyPress
+ * @since 1.3
+ */
+ function bp_get_search_slug() {
+ global $bp;
+
+ return apply_filters( 'bp_get_search_slug', BP_SEARCH_SLUG );
+ }
+
</ins><span class="cx"> /** is_() functions to determine the current page *****************************/
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkbpfriendsbpfriendsnotificationsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-friends/bp-friends-notifications.php (4637 => 4638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-friends/bp-friends-notifications.php 2011-07-09 22:36:13 UTC (rev 4637)
+++ trunk/bp-friends/bp-friends-notifications.php 2011-07-09 22:58:18 UTC (rev 4638)
</span><span class="lines">@@ -11,8 +11,8 @@
</span><span class="cx"> $ud = get_userdata( $friend_id );
</span><span class="cx"> $initiator_ud = get_userdata( $initiator_id );
</span><span class="cx">
</span><del>- $all_requests_link = bp_core_get_user_domain( $friend_id ) . BP_FRIENDS_SLUG . '/requests/';
- $settings_link = bp_core_get_user_domain( $friend_id ) . BP_SETTINGS_SLUG . '/notifications';
</del><ins>+ $all_requests_link = bp_core_get_user_domain( $friend_id ) . bp_get_friends_slug() . '/requests/';
+ $settings_link = bp_core_get_user_domain( $friend_id ) . bp_get_settings_slug() . '/notifications';
</ins><span class="cx">
</span><span class="cx"> $initiator_link = bp_core_get_user_domain( $initiator_id );
</span><span class="cx">
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> $ud = get_userdata( $initiator_id );
</span><span class="cx">
</span><span class="cx"> $friend_link = bp_core_get_user_domain( $friend_id );
</span><del>- $settings_link = bp_core_get_user_domain( $initiator_id ) . BP_SETTINGS_SLUG . '/notifications';
</del><ins>+ $settings_link = bp_core_get_user_domain( $initiator_id ) . bp_get_settings_slug() . '/notifications';
</ins><span class="cx">
</span><span class="cx"> // Set up and send the message
</span><span class="cx"> $to = $ud->user_email;
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupsnotificationsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-notifications.php (4637 => 4638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-notifications.php 2011-07-09 22:36:13 UTC (rev 4637)
+++ trunk/bp-groups/bp-groups-notifications.php 2011-07-09 22:58:18 UTC (rev 4638)
</span><span class="lines">@@ -16,8 +16,8 @@
</span><span class="cx"> // Set up and send the message
</span><span class="cx"> $to = $ud->user_email;
</span><span class="cx">
</span><del>- $group_link = site_url( $bp->groups->slug . '/' . $group->slug );
- $settings_link = bp_core_get_user_domain( $user_id ) . BP_SETTINGS_SLUG . '/notifications/';
</del><ins>+ $group_link = site_url( bp_get_groups_root_slug(). '/' . $group->slug );
+ $settings_link = bp_core_get_user_domain( $user_id ) . bp_get_settings_slug() . '/notifications/';
</ins><span class="cx">
</span><span class="cx"> $message = sprintf( __(
</span><span class="cx"> 'Group details for the group "%1$s" were updated:
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx">
</span><span class="cx"> $group_requests = bp_get_group_permalink( $group ) . 'admin/membership-requests';
</span><span class="cx"> $profile_link = bp_core_get_user_domain( $requesting_user_id );
</span><del>- $settings_link = bp_core_get_user_domain( $requesting_user_id ) . BP_SETTINGS_SLUG . '/notifications/';
</del><ins>+ $settings_link = bp_core_get_user_domain( $requesting_user_id ) . bp_get_settings_slug() . '/notifications/';
</ins><span class="cx">
</span><span class="cx"> // Set up and send the message
</span><span class="cx"> $to = $ud->user_email;
</span><span class="lines">@@ -107,7 +107,7 @@
</span><span class="cx"> $ud = bp_core_get_core_userdata($requesting_user_id);
</span><span class="cx">
</span><span class="cx"> $group_link = bp_get_group_permalink( $group );
</span><del>- $settings_link = bp_core_get_user_domain( $requesting_user_id ) . BP_SETTINGS_SLUG . '/notifications/';
</del><ins>+ $settings_link = bp_core_get_user_domain( $requesting_user_id ) . bp_get_settings_slug() . '/notifications/';
</ins><span class="cx">
</span><span class="cx"> // Set up and send the message
</span><span class="cx"> $to = $ud->user_email;
</span><span class="lines">@@ -167,7 +167,7 @@
</span><span class="cx"> $ud = bp_core_get_core_userdata($user_id);
</span><span class="cx">
</span><span class="cx"> $group_link = bp_get_group_permalink( $group );
</span><del>- $settings_link = bp_core_get_user_domain( $user_id ) . BP_SETTINGS_SLUG . '/notifications/';
</del><ins>+ $settings_link = bp_core_get_user_domain( $user_id ) . bp_get_settings_slug() . '/notifications/';
</ins><span class="cx">
</span><span class="cx"> // Set up and send the message
</span><span class="cx"> $to = $ud->user_email;
</span><span class="lines">@@ -215,7 +215,7 @@
</span><span class="cx">
</span><span class="cx"> $invited_ud = bp_core_get_core_userdata($invited_user_id);
</span><span class="cx">
</span><del>- $settings_link = bp_core_get_user_domain( $invited_user_id ) . BP_SETTINGS_SLUG . '/notifications/';
</del><ins>+ $settings_link = bp_core_get_user_domain( $invited_user_id ) . bp_get_settings_slug() . '/notifications/';
</ins><span class="cx"> $invited_link = bp_core_get_user_domain( $invited_user_id );
</span><span class="cx"> $invites_link = $invited_link . $bp->groups->slug . '/invites';
</span><span class="cx">
</span><span class="lines">@@ -275,7 +275,7 @@
</span><span class="cx"> $poster_name = bp_core_get_user_displayname( $poster_user_id );
</span><span class="cx">
</span><span class="cx"> $message_link = bp_activity_get_permalink( $activity_id );
</span><del>- $settings_link = bp_core_get_user_domain( $receiver_user_id ) . BP_SETTINGS_SLUG . '/notifications/';
</del><ins>+ $settings_link = bp_core_get_user_domain( $receiver_user_id ) . bp_get_settings_slug() . '/notifications/';
</ins><span class="cx">
</span><span class="cx"> $poster_name = stripslashes( $poster_name );
</span><span class="cx"> $content = bp_groups_filter_kses( stripslashes( $content ) );
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupsscreensphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-screens.php (4637 => 4638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-screens.php 2011-07-09 22:36:13 UTC (rev 4637)
+++ trunk/bp-groups/bp-groups-screens.php 2011-07-09 22:58:18 UTC (rev 4638)
</span><span class="lines">@@ -453,7 +453,7 @@
</span><span class="cx"> function groups_screen_group_admin() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><del>- if ( !bp_is_current_component( BP_GROUPS_SLUG ) || !bp_is_current_action( 'admin' ) )
</del><ins>+ if ( !bp_is_current_component( 'groups' ) || !bp_is_current_action( 'admin' ) )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if ( !empty( $bp->action_variables[0] ) )
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-template.php (4637 => 4638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-template.php 2011-07-09 22:36:13 UTC (rev 4637)
+++ trunk/bp-groups/bp-groups-template.php 2011-07-09 22:58:18 UTC (rev 4638)
</span><span class="lines">@@ -2677,7 +2677,7 @@
</span><span class="cx"> function bp_get_group_invite_user_remove_invite_url() {
</span><span class="cx"> global $invites_template;
</span><span class="cx">
</span><del>- return wp_nonce_url( site_url( BP_GROUPS_SLUG . '/' . $invites_template->invite->group_id . '/invites/remove/' . $invites_template->invite->user->id ), 'groups_invite_uninvite_user' );
</del><ins>+ return wp_nonce_url( site_url( bp_get_groups_slug() . '/' . $invites_template->invite->group_id . '/invites/remove/' . $invites_template->invite->user->id ), 'groups_invite_uninvite_user' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /***
</span></span></pre></div>
<a id="trunkbpmembersbpmemberstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-members/bp-members-template.php (4637 => 4638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-members/bp-members-template.php 2011-07-09 22:36:13 UTC (rev 4637)
+++ trunk/bp-members/bp-members-template.php 2011-07-09 22:58:18 UTC (rev 4638)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> * @subpackage Members Template
</span><span class="cx"> * @since BuddyPress {unknown}
</span><span class="cx"> *
</span><del>- * @uses bp_get_members_slug()
</del><ins>+ * @uses bp_get_signup_slug()
</ins><span class="cx"> */
</span><span class="cx"> function bp_signup_slug() {
</span><span class="cx"> echo bp_get_signup_slug();
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> * @subpackage Members Template
</span><span class="cx"> * @since BuddyPress {unknown}
</span><span class="cx"> *
</span><del>- * @uses bp_get_members_slug()
</del><ins>+ * @uses bp_get_activate_slug()
</ins><span class="cx"> */
</span><span class="cx"> function bp_activate_slug() {
</span><span class="cx"> echo bp_get_activate_slug();
</span></span></pre></div>
<a id="trunkbpmessagesbpmessagesnotificationsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-messages/bp-messages-notifications.php (4637 => 4638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-messages/bp-messages-notifications.php 2011-07-09 22:36:13 UTC (rev 4637)
+++ trunk/bp-messages/bp-messages-notifications.php 2011-07-09 22:58:18 UTC (rev 4638)
</span><span class="lines">@@ -14,8 +14,8 @@
</span><span class="cx">
</span><span class="cx"> // User data and links
</span><span class="cx"> $ud = get_userdata( $recipient->user_id );
</span><del>- $message_link = bp_core_get_user_domain( $recipient->user_id ) . BP_MESSAGES_SLUG .'/';
- $settings_link = bp_core_get_user_domain( $recipient->user_id ) . BP_SETTINGS_SLUG . '/notifications/';
</del><ins>+ $message_link = bp_core_get_user_domain( $recipient->user_id ) . bp_get_messages_slug() .'/';
+ $settings_link = bp_core_get_user_domain( $recipient->user_id ) . bp_get_settings_slug() . '/notifications/';
</ins><span class="cx">
</span><span class="cx"> // Sender info
</span><span class="cx"> $sender_name = stripslashes( $sender_name );
</span></span></pre></div>
<a id="trunkbpmessagesbpmessagestemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-messages/bp-messages-template.php (4637 => 4638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-messages/bp-messages-template.php 2011-07-09 22:36:13 UTC (rev 4637)
+++ trunk/bp-messages/bp-messages-template.php 2011-07-09 22:58:18 UTC (rev 4638)
</span><span class="lines">@@ -717,7 +717,7 @@
</span><span class="cx"> $r = wp_parse_args( $args, $defaults );
</span><span class="cx"> extract( $r, EXTR_SKIP );
</span><span class="cx">
</span><del>- if ( !$thread_id && $bp->current_component == BP_MESSAGES_SLUG && 'view' == $bp->current_action )
</del><ins>+ if ( !$thread_id && bp_is_current_component( 'messages' ) && bp_is_current_action( 'view' ) )
</ins><span class="cx"> $thread_id = (int)$bp->action_variables[0];
</span><span class="cx">
</span><span class="cx"> $thread_template = new BP_Messages_Thread_Template( $thread_id, $order );
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultblogsindexphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/blogs/index.php (4637 => 4638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/blogs/index.php 2011-07-09 22:36:13 UTC (rev 4637)
+++ trunk/bp-themes/bp-default/blogs/index.php 2011-07-09 22:58:18 UTC (rev 4638)
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx">
</span><span class="cx"> <form action="" method="post" id="blogs-directory-form" class="dir-form">
</span><span class="cx">
</span><del>- <h3><?php _e( 'Site Directory', 'buddypress' ); ?><?php if ( is_user_logged_in() && bp_blog_signup_enabled() ) : ?> &nbsp;<a class="button" href="<?php echo bp_get_root_domain() . '/' . BP_BLOGS_SLUG . '/create/' ?>"><?php _e( 'Create a Site', 'buddypress' ); ?></a><?php endif; ?></h3>
</del><ins>+ <h3><?php _e( 'Site Directory', 'buddypress' ); ?><?php if ( is_user_logged_in() && bp_blog_signup_enabled() ) : ?> &nbsp;<a class="button" href="<?php echo bp_get_root_domain() . '/' . bp_get_blogs_slug() . '/create/' ?>"><?php _e( 'Create a Site', 'buddypress' ); ?></a><?php endif; ?></h3>
</ins><span class="cx">
</span><span class="cx"> <div id="blog-dir-search" class="dir-search" role="search">
</span><span class="cx">
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx">
</span><span class="cx"> <?php if ( is_user_logged_in() && bp_get_total_blog_count_for_user( bp_loggedin_user_id() ) ) : ?>
</span><span class="cx">
</span><del>- <li id="blogs-personal"><a href="<?php echo bp_loggedin_user_domain() . BP_BLOGS_SLUG . '/my-blogs/' ?>"><?php printf( __( 'My Sites (%s)', 'buddypress' ), bp_get_total_blog_count_for_user( bp_loggedin_user_id() ) ); ?></a></li>
</del><ins>+ <li id="blogs-personal"><a href="<?php echo bp_loggedin_user_domain() . bp_get_blogs_slug() . '/my-blogs/' ?>"><?php printf( __( 'My Sites (%s)', 'buddypress' ), bp_get_total_blog_count_for_user( bp_loggedin_user_id() ) ); ?></a></li>
</ins><span class="cx">
</span><span class="cx"> <?php endif; ?>
</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 (4637 => 4638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/members/index.php 2011-07-09 22:36:13 UTC (rev 4637)
+++ trunk/bp-themes/bp-default/members/index.php 2011-07-09 22:58:18 UTC (rev 4638)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><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><del>- <li id="members-personal"><a href="<?php echo bp_loggedin_user_domain() . BP_FRIENDS_SLUG . '/my-friends/' ?>"><?php printf( __( 'My Friends (%s)', 'buddypress' ), bp_get_total_friend_count( bp_loggedin_user_id() ) ); ?></a></li>
</del><ins>+ <li id="members-personal"><a href="<?php echo bp_loggedin_user_domain() . bp_get_friends_slug() . '/my-friends/' ?>"><?php printf( __( 'My Friends (%s)', 'buddypress' ), bp_get_total_friend_count( bp_loggedin_user_id() ) ); ?></a></li>
</ins><span class="cx">
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>