<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[BuddyPress] [2413] trunk: Fixes #1672</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2413</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-01-23 14:06:25 +0000 (Sat, 23 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes #1672</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpgroupsbpgroupsnotificationsphp">trunk/bp-groups/bp-groups-notifications.php</a></li>
<li><a href="#trunkbpgroupsbpgroupstemplatetagsphp">trunk/bp-groups/bp-groups-templatetags.php</a></li>
<li><a href="#trunkbpthemesbpdefault_incajaxphp">trunk/bp-themes/bp-default/_inc/ajax.php</a></li>
<li><a href="#trunkbpthemesbpsnparent_incajaxphp">trunk/bp-themes/bp-sn-parent/_inc/ajax.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpgroupsbpgroupsnotificationsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-notifications.php (2412 => 2413)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-notifications.php 2010-01-23 14:03:42 UTC (rev 2412)
+++ trunk/bp-groups/bp-groups-notifications.php 2010-01-23 14:06:25 UTC (rev 2413)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> $ud = get_userdata($admin_id);
</span><span class="cx"> $requesting_ud = get_userdata($requesting_user_id);
</span><span class="cx">
</span><del>- $group_requests = bp_get_group_permalink( $group ) . '/admin/membership-requests';
</del><ins>+ $group_requests = bp_get_group_permalink( $group ) . 'admin/membership-requests';
</ins><span class="cx"> $profile_link = bp_core_get_user_domain( $requesting_user_id );
</span><span class="cx"> $settings_link = bp_core_get_user_domain( $requesting_user_id ) . 'settings/notifications/';
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupstemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-templatetags.php (2412 => 2413)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-templatetags.php 2010-01-23 14:03:42 UTC (rev 2412)
+++ trunk/bp-groups/bp-groups-templatetags.php 2010-01-23 14:06:25 UTC (rev 2413)
</span><span class="lines">@@ -591,7 +591,7 @@
</span><span class="cx"> if ( !$group )
</span><span class="cx"> $group =& $groups_template->group;
</span><span class="cx">
</span><del>- return apply_filters( 'bp_get_group_all_members_permalink', bp_get_group_permalink( $group ) . '/members' );
</del><ins>+ return apply_filters( 'bp_get_group_all_members_permalink', bp_get_group_permalink( $group ) . 'members' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_group_search_form() {
</span><span class="lines">@@ -685,7 +685,7 @@
</span><span class="cx"> if ( !$group )
</span><span class="cx"> $group =& $groups_template->group;
</span><span class="cx">
</span><del>- return apply_filters( 'bp_get_group_forum_permalink', bp_get_group_permalink( $group ) . '/forum' );
</del><ins>+ return apply_filters( 'bp_get_group_forum_permalink', bp_get_group_permalink( $group ) . 'forum' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_group_is_forum_enabled( $group = false ) {
</span><span class="lines">@@ -827,7 +827,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>- return apply_filters( 'bp_get_group_member_promote_mod_link', wp_nonce_url( bp_get_group_permalink( $group ) . '/admin/manage-members/promote/mod/' . $user_id, 'groups_promote_member' ) );
</del><ins>+ return apply_filters( 'bp_get_group_member_promote_mod_link', wp_nonce_url( bp_get_group_permalink( $group ) . 'admin/manage-members/promote/mod/' . $user_id, 'groups_promote_member' ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_group_member_promote_admin_link( $args = '' ) {
</span><span class="lines">@@ -844,7 +844,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>- return apply_filters( 'bp_get_group_member_promote_admin_link', wp_nonce_url( bp_get_group_permalink( $group ) . '/admin/manage-members/promote/admin/' . $user_id, 'groups_promote_member' ) );
</del><ins>+ return apply_filters( 'bp_get_group_member_promote_admin_link', wp_nonce_url( bp_get_group_permalink( $group ) . 'admin/manage-members/promote/admin/' . $user_id, 'groups_promote_member' ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_group_member_demote_link( $user_id = false, $deprecated = false ) {
</span><span class="lines">@@ -864,7 +864,7 @@
</span><span class="cx"> if ( !$user_id )
</span><span class="cx"> $user_id = $members_template->member->user_id;
</span><span class="cx">
</span><del>- return apply_filters( 'bp_get_group_member_demote_link', wp_nonce_url( bp_get_group_permalink( $group ) . '/admin/manage-members/demote/' . $user_id, 'groups_demote_member' ) );
</del><ins>+ return apply_filters( 'bp_get_group_member_demote_link', wp_nonce_url( bp_get_group_permalink( $group ) . 'admin/manage-members/demote/' . $user_id, 'groups_demote_member' ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_group_member_ban_link( $user_id = false, $deprecated = false ) {
</span><span class="lines">@@ -881,7 +881,7 @@
</span><span class="cx"> if ( !$group )
</span><span class="cx"> $group =& $groups_template->group;
</span><span class="cx">
</span><del>- return apply_filters( 'bp_get_group_member_ban_link', wp_nonce_url( bp_get_group_permalink( $group ) . '/admin/manage-members/ban/' . $user_id, 'groups_ban_member' ) );
</del><ins>+ return apply_filters( 'bp_get_group_member_ban_link', wp_nonce_url( bp_get_group_permalink( $group ) . 'admin/manage-members/ban/' . $user_id, 'groups_ban_member' ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_group_member_unban_link( $user_id = false, $deprecated = false ) {
</span><span class="lines">@@ -901,7 +901,7 @@
</span><span class="cx"> if ( !$group )
</span><span class="cx"> $group =& $groups_template->group;
</span><span class="cx">
</span><del>- return apply_filters( 'bp_get_group_member_unban_link', wp_nonce_url( bp_get_group_permalink( $group ) . '/admin/manage-members/unban/' . $user_id, 'groups_unban_member' ) );
</del><ins>+ return apply_filters( 'bp_get_group_member_unban_link', wp_nonce_url( bp_get_group_permalink( $group ) . 'admin/manage-members/unban/' . $user_id, 'groups_unban_member' ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_group_admin_tabs( $group = false ) {
</span><span class="lines">@@ -950,7 +950,7 @@
</span><span class="cx"> if ( !$group )
</span><span class="cx"> $group =& $groups_template->group;
</span><span class="cx">
</span><del>- return apply_filters( 'bp_group_form_action', bp_get_group_permalink( $group ) . '/' . $page );
</del><ins>+ return apply_filters( 'bp_group_form_action', bp_get_group_permalink( $group ) . $page );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_group_admin_form_action( $page = false, $deprecated = false ) {
</span><span class="lines">@@ -965,7 +965,7 @@
</span><span class="cx"> if ( !$page )
</span><span class="cx"> $page = $bp->action_variables[0];
</span><span class="cx">
</span><del>- return apply_filters( 'bp_group_admin_form_action', bp_get_group_permalink( $group ) . '/admin/' . $page );
</del><ins>+ return apply_filters( 'bp_group_admin_form_action', bp_get_group_permalink( $group ) . 'admin/' . $page );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_group_has_requested_membership( $group = false ) {
</span><span class="lines">@@ -1028,7 +1028,7 @@
</span><span class="cx"> if ( !$group )
</span><span class="cx"> $group =& $groups_template->group;
</span><span class="cx">
</span><del>- return apply_filters( 'bp_group_leave_confirm_link', wp_nonce_url( bp_get_group_permalink( $group ) . '/leave-group/yes', 'groups_leave_group' ) );
</del><ins>+ return apply_filters( 'bp_group_leave_confirm_link', wp_nonce_url( bp_get_group_permalink( $group ) . 'leave-group/yes', 'groups_leave_group' ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_group_leave_reject_link( $deprecated = false ) {
</span><span class="lines">@@ -1052,7 +1052,7 @@
</span><span class="cx"> if ( !$group )
</span><span class="cx"> $group =& $groups_template->group;
</span><span class="cx">
</span><del>- return apply_filters( 'bp_group_send_invite_form_action', bp_get_group_permalink( $group ) . '/send-invites/send' );
</del><ins>+ return apply_filters( 'bp_group_send_invite_form_action', bp_get_group_permalink( $group ) . 'send-invites/send' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_has_friends_to_invite( $group = false ) {
</span><span class="lines">@@ -1088,17 +1088,17 @@
</span><span class="cx"> switch ( $group->status ) {
</span><span class="cx"> case 'public':
</span><span class="cx"> if ( BP_Groups_Member::check_is_member( $bp->loggedin_user->id, $group->id ) )
</span><del>- echo '<a class="leave-group" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . '/leave-group', 'groups_leave_group' ) . '">' . __( 'Leave Group', 'buddypress' ) . '</a>';
</del><ins>+ echo '<a class="leave-group" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . 'leave-group', 'groups_leave_group' ) . '">' . __( 'Leave Group', 'buddypress' ) . '</a>';
</ins><span class="cx"> else
</span><del>- echo '<a class="join-group" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . '/join', 'groups_join_group' ) . '">' . __( 'Join Group', 'buddypress' ) . '</a>';
</del><ins>+ echo '<a class="join-group" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . 'join', 'groups_join_group' ) . '">' . __( 'Join Group', 'buddypress' ) . '</a>';
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case 'private':
</span><span class="cx"> if ( BP_Groups_Member::check_is_member( $bp->loggedin_user->id, $group->id ) ) {
</span><del>- echo '<a class="leave-group" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . '/leave-group', 'groups_leave_group' ) . '">' . __( 'Leave Group', 'buddypress' ) . '</a>';
</del><ins>+ echo '<a class="leave-group" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . 'leave-group', 'groups_leave_group' ) . '">' . __( 'Leave Group', 'buddypress' ) . '</a>';
</ins><span class="cx"> } else {
</span><span class="cx"> if ( !bp_group_has_requested_membership( $group ) )
</span><del>- echo '<a class="request-membership" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . '/request-membership', 'groups_request_membership' ) . '">' . __('Request Membership', 'buddypress') . '</a>';
</del><ins>+ echo '<a class="request-membership" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . 'request-membership', 'groups_request_membership' ) . '">' . __('Request Membership', 'buddypress') . '</a>';
</ins><span class="cx"> else
</span><span class="cx"> echo '<a class="membership-requested" href="' . bp_get_group_permalink( $group ) . '">' . __( 'Request Sent', 'buddypress' ) . '</a>';
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbpthemesbpdefault_incajaxphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/ajax.php (2412 => 2413)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/ajax.php 2010-01-23 14:03:42 UTC (rev 2412)
+++ trunk/bp-themes/bp-default/_inc/ajax.php 2010-01-23 14:06:25 UTC (rev 2413)
</span><span class="lines">@@ -393,7 +393,7 @@
</span><span class="cx"> if ( !groups_join_group( $group->id ) ) {
</span><span class="cx"> _e( 'Error joining group', 'buddypress' );
</span><span class="cx"> } else {
</span><del>- echo '<a id="group-' . attribute_escape( $group->id ) . '" class="leave-group" rel="leave" title="' . __( 'Leave Group', 'buddypress' ) . '" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . '/leave-group', 'groups_leave_group' ) . '">' . __( 'Leave Group', 'buddypress' ) . '</a>';
</del><ins>+ echo '<a id="group-' . attribute_escape( $group->id ) . '" class="leave-group" rel="leave" title="' . __( 'Leave Group', 'buddypress' ) . '" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . 'leave-group', 'groups_leave_group' ) . '">' . __( 'Leave Group', 'buddypress' ) . '</a>';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } else if ( 'private' == $group->status ) {
</span><span class="lines">@@ -415,9 +415,9 @@
</span><span class="cx"> _e( 'Error leaving group', 'buddypress' );
</span><span class="cx"> } else {
</span><span class="cx"> if ( 'public' == $group->status ) {
</span><del>- echo '<a id="group-' . attribute_escape( $group->id ) . '" class="join-group" rel="join" title="' . __( 'Join Group', 'buddypress' ) . '" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . '/join', 'groups_join_group' ) . '">' . __( 'Join Group', 'buddypress' ) . '</a>';
</del><ins>+ echo '<a id="group-' . attribute_escape( $group->id ) . '" class="join-group" rel="join" title="' . __( 'Join Group', 'buddypress' ) . '" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . 'join', 'groups_join_group' ) . '">' . __( 'Join Group', 'buddypress' ) . '</a>';
</ins><span class="cx"> } else if ( 'private' == $group->status ) {
</span><del>- echo '<a id="group-' . attribute_escape( $group->id ) . '" class="request-membership" rel="join" title="' . __( 'Request Membership', 'buddypress' ) . '" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . '/request-membership', 'groups_send_membership_request' ) . '">' . __( 'Request Membership', 'buddypress' ) . '</a>';
</del><ins>+ echo '<a id="group-' . attribute_escape( $group->id ) . '" class="request-membership" rel="join" title="' . __( 'Request Membership', 'buddypress' ) . '" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . 'request-membership', 'groups_send_membership_request' ) . '">' . __( 'Request Membership', 'buddypress' ) . '</a>';
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbpthemesbpsnparent_incajaxphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-sn-parent/_inc/ajax.php (2412 => 2413)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-sn-parent/_inc/ajax.php 2010-01-23 14:03:42 UTC (rev 2412)
+++ trunk/bp-themes/bp-sn-parent/_inc/ajax.php 2010-01-23 14:06:25 UTC (rev 2413)
</span><span class="lines">@@ -224,7 +224,7 @@
</span><span class="cx"> if ( !groups_join_group( $group->id ) ) {
</span><span class="cx"> _e( 'Error joining group', 'buddypress' );
</span><span class="cx"> } else {
</span><del>- echo '<a id="group-' . attribute_escape( $group->id ) . '" class="leave-group" rel="leave" title="' . __( 'Leave Group', 'buddypress' ) . '" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . '/leave-group', 'groups_leave_group' ) . '">' . __( 'Leave Group', 'buddypress' ) . '</a>';
</del><ins>+ echo '<a id="group-' . attribute_escape( $group->id ) . '" class="leave-group" rel="leave" title="' . __( 'Leave Group', 'buddypress' ) . '" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . 'leave-group', 'groups_leave_group' ) . '">' . __( 'Leave Group', 'buddypress' ) . '</a>';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } else if ( 'private' == $group->status ) {
</span><span class="lines">@@ -246,9 +246,9 @@
</span><span class="cx"> _e( 'Error leaving group', 'buddypress' );
</span><span class="cx"> } else {
</span><span class="cx"> if ( 'public' == $group->status ) {
</span><del>- echo '<a id="group-' . attribute_escape( $group->id ) . '" class="join-group" rel="join" title="' . __( 'Join Group', 'buddypress' ) . '" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . '/join', 'groups_join_group' ) . '">' . __( 'Join Group', 'buddypress' ) . '</a>';
</del><ins>+ echo '<a id="group-' . attribute_escape( $group->id ) . '" class="join-group" rel="join" title="' . __( 'Join Group', 'buddypress' ) . '" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . 'join', 'groups_join_group' ) . '">' . __( 'Join Group', 'buddypress' ) . '</a>';
</ins><span class="cx"> } else if ( 'private' == $group->status ) {
</span><del>- echo '<a id="group-' . attribute_escape( $group->id ) . '" class="request-membership" rel="join" title="' . __( 'Request Membership', 'buddypress' ) . '" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . '/request-membership', 'groups_send_membership_request' ) . '">' . __( 'Request Membership', 'buddypress' ) . '</a>';
</del><ins>+ echo '<a id="group-' . attribute_escape( $group->id ) . '" class="request-membership" rel="join" title="' . __( 'Request Membership', 'buddypress' ) . '" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . 'request-membership', 'groups_send_membership_request' ) . '">' . __( 'Request Membership', 'buddypress' ) . '</a>';
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>