<!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][5417] trunk: Ensures links are constructed with trailing slash in groups, members, and messages components.</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><a href="http://buddypress.trac.wordpress.org/changeset/5417">5417</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2011-11-29 23:06:58 +0000 (Tue, 29 Nov 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Ensures links are constructed with trailing slash in groups, members, and messages components. See <a href="http://buddypress.trac.wordpress.org/ticket/3779">#3779</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpgroupsbpgroupsactivityphp">trunk/bp-groups/bp-groups-activity.php</a></li>
<li><a href="#trunkbpgroupsbpgroupsclassesphp">trunk/bp-groups/bp-groups-classes.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="#trunkbpmembersbpmemberssignupphp">trunk/bp-members/bp-members-signup.php</a></li>
<li><a href="#trunkbpmembersbpmemberstemplatephp">trunk/bp-members/bp-members-template.php</a></li>
<li><a href="#trunkbpmessagesbpmessagesactionsphp">trunk/bp-messages/bp-messages-actions.php</a></li>
<li><a href="#trunkbpmessagesbpmessagesfunctionsphp">trunk/bp-messages/bp-messages-functions.php</a></li>
<li><a href="#trunkbpmessagesbpmessagesscreensphp">trunk/bp-messages/bp-messages-screens.php</a></li>
<li><a href="#trunkbpmessagesbpmessagestemplatephp">trunk/bp-messages/bp-messages-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpgroupsbpgroupsactivityphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-activity.php (5416 => 5417)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-activity.php 2011-11-29 22:18:26 UTC (rev 5416)
+++ trunk/bp-groups/bp-groups-activity.php 2011-11-29 23:06:58 UTC (rev 5417)
</span><span class="lines">@@ -129,7 +129,7 @@
</span><span class="cx"> if ( (int)$total_items > 1 ) {
</span><span class="cx"> $text = sprintf( __( '%d accepted group membership requests', 'buddypress' ), (int)$total_items, $group->name );
</span><span class="cx"> $filter = 'bp_groups_multiple_membership_request_accepted_notification';
</span><del>- $notification_link = bp_loggedin_user_domain() . bp_get_groups_slug() . '/?n=1';
</del><ins>+ $notification_link = trailingslashit( bp_loggedin_user_domain() . bp_get_groups_slug() ) . '?n=1';
</ins><span class="cx">
</span><span class="cx"> if ( 'string' == $format ) {
</span><span class="cx"> return apply_filters( $filter, '<a href="' . $notification_link . '" title="' . __( 'Groups', 'buddypress' ) . '">' . $text . '</a>', $total_items, $group->name, $text, $notification_link );
</span><span class="lines">@@ -165,7 +165,7 @@
</span><span class="cx"> if ( (int)$total_items > 1 ) {
</span><span class="cx"> $text = sprintf( __( '%d rejected group membership requests', 'buddypress' ), (int)$total_items, $group->name );
</span><span class="cx"> $filter = 'bp_groups_multiple_membership_request_rejected_notification';
</span><del>- $notification_link = bp_loggedin_user_domain() . bp_get_groups_slug() . '/?n=1';
</del><ins>+ $notification_link = trailingslashit( bp_loggedin_user_domain() . bp_get_groups_slug() ) . '?n=1';
</ins><span class="cx">
</span><span class="cx"> if ( 'string' == $format ) {
</span><span class="cx"> return apply_filters( $filter, '<a href="' . $notification_link . '" title="' . __( 'Groups', 'buddypress' ) . '">' . $text . '</a>', $total_items, $group->name );
</span><span class="lines">@@ -201,7 +201,7 @@
</span><span class="cx"> if ( (int)$total_items > 1 ) {
</span><span class="cx"> $text = sprintf( __( 'You were promoted to an admin in %d groups', 'buddypress' ), (int)$total_items );
</span><span class="cx"> $filter = 'bp_groups_multiple_member_promoted_to_admin_notification';
</span><del>- $notification_link = bp_loggedin_user_domain() . bp_get_groups_slug() . '?n=1';
</del><ins>+ $notification_link = trailingslashit( bp_loggedin_user_domain() . bp_get_groups_slug() ) . '?n=1';
</ins><span class="cx">
</span><span class="cx"> if ( 'string' == $format ) {
</span><span class="cx"> return apply_filters( $filter, '<a href="' . $notification_link . '" title="' . __( 'Groups', 'buddypress' ) . '">' . $text . '</a>', $total_items, $text, $notification_link );
</span><span class="lines">@@ -237,7 +237,7 @@
</span><span class="cx"> if ( (int)$total_items > 1 ) {
</span><span class="cx"> $text = sprintf( __( 'You were promoted to a mod in %d groups', 'buddypress' ), (int)$total_items );
</span><span class="cx"> $filter = 'bp_groups_multiple_member_promoted_to_mod_notification';
</span><del>- $notification_link = bp_loggedin_user_domain() . bp_get_groups_slug() . '?n=1';
</del><ins>+ $notification_link = trailingslashit( bp_loggedin_user_domain() . bp_get_groups_slug() ) . '?n=1';
</ins><span class="cx">
</span><span class="cx"> if ( 'string' == $format ) {
</span><span class="cx"> return apply_filters( $filter, '<a href="' . $notification_link . '" title="' . __( 'Groups', 'buddypress' ) . '">' . $text . '</a>', $total_items, $text, $notification_link );
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupsclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-classes.php (5416 => 5417)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-classes.php 2011-11-29 22:18:26 UTC (rev 5416)
+++ trunk/bp-groups/bp-groups-classes.php 2011-11-29 23:06:58 UTC (rev 5417)
</span><span class="lines">@@ -1279,7 +1279,7 @@
</span><span class="cx">
</span><span class="cx"> // Construct the admin edit tab for the new group extension
</span><span class="cx"> if ( !empty( $this->enable_edit_item ) && !empty( $bp->is_item_admin ) ) {
</span><del>- add_action( 'groups_admin_tabs', create_function( '$current, $group_slug', '$selected = ""; if ( "' . esc_attr( $this->admin_slug ) . '" == $current ) $selected = " class=\"current\""; echo "<li{$selected}><a href=\"' . bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/{$group_slug}/admin/' . esc_attr( $this->admin_slug ) . '\">' . esc_attr( $this->admin_name ) . '</a></li>";' ), 10, 2 );
</del><ins>+ add_action( 'groups_admin_tabs', create_function( '$current, $group_slug', '$selected = ""; if ( "' . esc_attr( $this->admin_slug ) . '" == $current ) $selected = " class=\"current\""; echo "<li{$selected}><a href=\"' . trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/{$group_slug}/admin/' . esc_attr( $this->admin_slug ) ) . '\">' . esc_attr( $this->admin_name ) . '</a></li>";' ), 10, 2 );
</ins><span class="cx">
</span><span class="cx"> // Catch the edit screen and forward it to the plugin template
</span><span class="cx"> if ( bp_is_groups_component() && bp_is_current_action( 'admin' ) && bp_is_action_variable( $this->admin_slug, 0 ) ) {
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupsnotificationsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-notifications.php (5416 => 5417)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-notifications.php 2011-11-29 22:18:26 UTC (rev 5416)
+++ trunk/bp-groups/bp-groups-notifications.php 2011-11-29 23:06:58 UTC (rev 5417)
</span><span class="lines">@@ -18,7 +18,7 @@
</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_get_groups_root_slug(). '/' . $group->slug );
</del><ins>+ $group_link = bp_get_group_permalink( $group );
</ins><span class="cx"> $settings_slug = function_exists( 'bp_get_settings_slug' ) ? bp_get_settings_slug() : 'settings';
</span><span class="cx"> $settings_link = bp_core_get_user_domain( $user_id ) . $settings_slug . '/notifications/';
</span><span class="cx">
</span><span class="lines">@@ -222,7 +222,7 @@
</span><span class="cx">
</span><span class="cx"> $settings_link = bp_core_get_user_domain( $invited_user_id ) . bp_get_settings_slug() . '/notifications/';
</span><span class="cx"> $invited_link = bp_core_get_user_domain( $invited_user_id );
</span><del>- $invites_link = $invited_link . bp_get_groups_slug() . '/invites';
</del><ins>+ $invites_link = trailingslashit( $invited_link . bp_get_groups_slug() . '/invites' );
</ins><span class="cx">
</span><span class="cx"> // Set up and send the message
</span><span class="cx"> $to = $invited_ud->user_email;
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupsscreensphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-screens.php (5416 => 5417)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-screens.php 2011-11-29 22:18:26 UTC (rev 5416)
+++ trunk/bp-groups/bp-groups-screens.php 2011-11-29 23:06:58 UTC (rev 5417)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> ) );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- bp_core_redirect( bp_loggedin_user_domain() . bp_get_groups_slug() . '/' . bp_current_action() );
</del><ins>+ bp_core_redirect( trailingslashit( bp_loggedin_user_domain() . bp_get_groups_slug() . '/' . bp_current_action() ) );
</ins><span class="cx">
</span><span class="cx"> } else if ( bp_is_action_variable( 'reject' ) && is_numeric( $group_id ) ) {
</span><span class="cx"> // Check the nonce
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> else
</span><span class="cx"> bp_core_add_message( __('Group invite rejected', 'buddypress') );
</span><span class="cx">
</span><del>- bp_core_redirect( bp_loggedin_user_domain() . bp_get_groups_slug() . '/' . bp_current_action() );
</del><ins>+ bp_core_redirect( trailingslashit( bp_loggedin_user_domain() . bp_get_groups_slug() . '/' . bp_current_action() ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Remove notifications
</span><span class="lines">@@ -790,10 +790,10 @@
</span><span class="cx">
</span><span class="cx"> do_action( 'groups_group_deleted', $bp->groups->current_group->id );
</span><span class="cx">
</span><del>- bp_core_redirect( bp_loggedin_user_domain() . bp_get_groups_slug() . '/' );
</del><ins>+ bp_core_redirect( trailingslashit( bp_loggedin_user_domain() . bp_get_groups_slug() ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- bp_core_redirect( bp_loggedin_user_domain() . bp_get_groups_slug() );
</del><ins>+ bp_core_redirect( trailingslashit( bp_loggedin_user_domain() . bp_get_groups_slug() ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> do_action( 'groups_screen_group_admin_delete_group', $bp->groups->current_group->id );
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-template.php (5416 => 5417)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-template.php 2011-11-29 22:18:26 UTC (rev 5416)
+++ trunk/bp-groups/bp-groups-template.php 2011-11-29 23:06:58 UTC (rev 5417)
</span><span class="lines">@@ -455,7 +455,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_admin_permalink', bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $group->slug . '/admin' );
</del><ins>+ return apply_filters( 'bp_get_group_admin_permalink', trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $group->slug . '/admin' ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_group_slug() {
</span><span class="lines">@@ -1267,28 +1267,28 @@
</span><span class="cx"> $current_tab = bp_action_variable( 0 );
</span><span class="cx"> ?>
</span><span class="cx"> <?php if ( $bp->is_item_admin || $bp->is_item_mod ) { ?>
</span><del>- <li<?php if ( 'edit-details' == $current_tab || empty( $current_tab ) ) : ?> class="current"<?php endif; ?>><a href="<?php echo bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $group->slug ?>/admin/edit-details"><?php _e( 'Details', 'buddypress' ); ?></a></li>
</del><ins>+ <li<?php if ( 'edit-details' == $current_tab || empty( $current_tab ) ) : ?> class="current"<?php endif; ?>><a href="<?php echo trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $group->slug . '/admin/edit-details' ) ?>"><?php _e( 'Details', 'buddypress' ); ?></a></li>
</ins><span class="cx"> <?php } ?>
</span><span class="cx">
</span><span class="cx"> <?php
</span><span class="cx"> if ( !$bp->is_item_admin )
</span><span class="cx"> return false;
</span><span class="cx"> ?>
</span><del>- <li<?php if ( 'group-settings' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $group->slug ?>/admin/group-settings"><?php _e( 'Settings', 'buddypress' ); ?></a></li>
</del><ins>+ <li<?php if ( 'group-settings' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $group->slug . '/admin/group-settings' ) ?>"><?php _e( 'Settings', 'buddypress' ); ?></a></li>
</ins><span class="cx">
</span><span class="cx"> <?php if ( !(int)bp_get_option( 'bp-disable-avatar-uploads' ) ) : ?>
</span><del>- <li<?php if ( 'group-avatar' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $group->slug ?>/admin/group-avatar"><?php _e( 'Avatar', 'buddypress' ); ?></a></li>
</del><ins>+ <li<?php if ( 'group-avatar' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $group->slug . '/admin/group-avatar' ) ?>"><?php _e( 'Avatar', 'buddypress' ); ?></a></li>
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><del>- <li<?php if ( 'manage-members' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $group->slug ?>/admin/manage-members"><?php _e( 'Members', 'buddypress' ); ?></a></li>
</del><ins>+ <li<?php if ( 'manage-members' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $group->slug . '/admin/manage-members' ) ?>"><?php _e( 'Members', 'buddypress' ); ?></a></li>
</ins><span class="cx">
</span><span class="cx"> <?php if ( $groups_template->group->status == 'private' ) : ?>
</span><del>- <li<?php if ( 'membership-requests' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $group->slug ?>/admin/membership-requests"><?php _e( 'Requests', 'buddypress' ); ?></a></li>
</del><ins>+ <li<?php if ( 'membership-requests' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $group->slug . '/admin/membership-requests' ) ?>"><?php _e( 'Requests', 'buddypress' ); ?></a></li>
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> <?php do_action( 'groups_admin_tabs', $current_tab, $group->slug ) ?>
</span><span class="cx">
</span><del>- <li<?php if ( 'delete-group' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $group->slug ?>/admin/delete-group"><?php _e( 'Delete', 'buddypress' ); ?></a></li>
</del><ins>+ <li<?php if ( 'delete-group' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $group->slug . '/admin/delete-group' ) ?>"><?php _e( 'Delete', 'buddypress' ); ?></a></li>
</ins><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1406,7 +1406,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_accept_invite_link', wp_nonce_url( $bp->loggedin_user->domain . bp_get_groups_slug() . '/invites/accept/' . $group->id, 'groups_accept_invite' ) );
</del><ins>+ return apply_filters( 'bp_get_group_accept_invite_link', wp_nonce_url( trailingslashit( $bp->loggedin_user->domain . bp_get_groups_slug() . '/invites/accept/' . $group->id ), 'groups_accept_invite' ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_group_reject_invite_link() {
</span><span class="lines">@@ -1418,7 +1418,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_reject_invite_link', wp_nonce_url( $bp->loggedin_user->domain . bp_get_groups_slug() . '/invites/reject/' . $group->id, 'groups_reject_invite' ) );
</del><ins>+ return apply_filters( 'bp_get_group_reject_invite_link', wp_nonce_url( trailingslashit( $bp->loggedin_user->domain . bp_get_groups_slug() . '/invites/reject/' . $group->id ), 'groups_reject_invite' ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_group_leave_confirm_link() {
</span><span class="lines">@@ -2018,7 +2018,7 @@
</span><span class="cx"> if ( !bp_action_variable( 1 ) )
</span><span class="cx"> $bp->action_variables[1] = array_shift( array_keys( $bp->groups->group_creation_steps ) );
</span><span class="cx">
</span><del>- return apply_filters( 'bp_get_group_creation_form_action', bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/create/step/' . bp_action_variable( 1 ) );
</del><ins>+ return apply_filters( 'bp_get_group_creation_form_action', trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/create/step/' . bp_action_variable( 1 ) ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_is_group_creation_step( $step_slug ) {
</span><span class="lines">@@ -2270,12 +2270,12 @@
</span><span class="cx"> function bp_groups_header_tabs() {
</span><span class="cx"> global $create_group_step, $completed_to_step;
</span><span class="cx"> ?>
</span><del>- <li<?php if ( !bp_action_variable( 0 ) || bp_is_action_variable( 'recently-active', 0 ) ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . bp_get_groups_slug() ?>/my-groups/recently-active"><?php _e( 'Recently Active', 'buddypress' ) ?></a></li>
- <li<?php if ( bp_is_action_variable( 'recently-joined', 0 ) ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . bp_get_groups_slug() ?>/my-groups/recently-joined"><?php _e( 'Recently Joined', 'buddypress' ) ?></a></li>
- <li<?php if ( bp_is_action_variable( 'most-popular', 0 ) ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . bp_get_groups_slug() ?>/my-groups/most-popular"><?php _e( 'Most Popular', 'buddypress' ) ?></a></li>
- <li<?php if ( bp_is_action_variable( 'admin-of', 0 ) ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . bp_get_groups_slug() ?>/my-groups/admin-of"><?php _e( 'Administrator Of', 'buddypress' ) ?></a></li>
- <li<?php if ( bp_is_action_variable( 'mod-of', 0 ) ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . bp_get_groups_slug() ?>/my-groups/mod-of"><?php _e( 'Moderator Of', 'buddypress' ) ?></a></li>
- <li<?php if ( bp_is_action_variable( 'alphabetically' ) ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . bp_get_groups_slug() ?>/my-groups/alphabetically"><?php _e( 'Alphabetically', 'buddypress' ) ?></a></li>
</del><ins>+ <li<?php if ( !bp_action_variable( 0 ) || bp_is_action_variable( 'recently-active', 0 ) ) : ?> class="current"<?php endif; ?>><a href="<?php echo trailingslashit( $bp->displayed_user->domain . bp_get_groups_slug() . '/my-groups/recently-active' ) ?>"><?php _e( 'Recently Active', 'buddypress' ) ?></a></li>
+ <li<?php if ( bp_is_action_variable( 'recently-joined', 0 ) ) : ?> class="current"<?php endif; ?>><a href="<?php echo trailingslashit( $bp->displayed_user->domain . bp_get_groups_slug() . '/my-groups/recently-joined' ) ?>"><?php _e( 'Recently Joined', 'buddypress' ) ?></a></li>
+ <li<?php if ( bp_is_action_variable( 'most-popular', 0 ) ) : ?> class="current"<?php endif; ?>><a href="<?php echo trailingslashit( $bp->displayed_user->domain . bp_get_groups_slug() . '/my-groups/most-popular' ) ?>"><?php _e( 'Most Popular', 'buddypress' ) ?></a></li>
+ <li<?php if ( bp_is_action_variable( 'admin-of', 0 ) ) : ?> class="current"<?php endif; ?>><a href="<?php echo trailingslashit( $bp->displayed_user->domain . bp_get_groups_slug() . '/my-groups/admin-of' ) ?>"><?php _e( 'Administrator Of', 'buddypress' ) ?></a></li>
+ <li<?php if ( bp_is_action_variable( 'mod-of', 0 ) ) : ?> class="current"<?php endif; ?>><a href="<?php echo trailingslashit( $bp->displayed_user->domain . bp_get_groups_slug() . '/my-groups/mod-of' ) ?>"><?php _e( 'Moderator Of', 'buddypress' ) ?></a></li>
+ <li<?php if ( bp_is_action_variable( 'alphabetically' ) ) : ?> class="current"<?php endif; ?>><a href="<?php echo trailingslashit( $bp->displayed_user->domain . bp_get_groups_slug() . '/my-groups/alphabetically' ) ?>"><?php _e( 'Alphabetically', 'buddypress' ) ?></a></li>
</ins><span class="cx"> <?php
</span><span class="cx"> do_action( 'groups_header_tabs' );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbpmembersbpmemberssignupphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-members/bp-members-signup.php (5416 => 5417)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-members/bp-members-signup.php 2011-11-29 22:18:26 UTC (rev 5416)
+++ trunk/bp-members/bp-members-signup.php 2011-11-29 23:06:58 UTC (rev 5417)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> // If the user is logged in, redirect away from here
</span><span class="cx"> if ( is_user_logged_in() ) {
</span><span class="cx"> if ( bp_is_component_front_page( 'register' ) )
</span><del>- $redirect_to = bp_get_root_domain() . '/' . bp_get_members_root_slug();
</del><ins>+ $redirect_to = trailingslashit( bp_get_root_domain() . '/' . bp_get_members_root_slug() );
</ins><span class="cx"> else
</span><span class="cx"> $redirect_to = bp_get_root_domain();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpmembersbpmemberstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-members/bp-members-template.php (5416 => 5417)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-members/bp-members-template.php 2011-11-29 22:18:26 UTC (rev 5416)
+++ trunk/bp-members/bp-members-template.php 2011-11-29 23:06:58 UTC (rev 5417)
</span><span class="lines">@@ -758,7 +758,7 @@
</span><span class="cx"> if ( $bp->loggedin_user->domain )
</span><span class="cx"> $link = str_replace( $bp->loggedin_user->domain, $bp->displayed_user->domain, $user_nav_item['link'] );
</span><span class="cx"> else
</span><del>- $link = $bp->displayed_user->domain . $user_nav_item['link'];
</del><ins>+ $link = trailingslashit( $bp->displayed_user->domain . $user_nav_item['link'] );
</ins><span class="cx">
</span><span class="cx"> echo apply_filters_ref_array( 'bp_get_displayed_user_nav_' . $user_nav_item['css_id'], array( '<li id="' . $user_nav_item['css_id'] . '-personal-li" ' . $selected . '><a id="user-' . $user_nav_item['css_id'] . '" href="' . $link . '">' . $user_nav_item['name'] . '</a></li>', &$user_nav_item ) );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbpmessagesbpmessagesactionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-messages/bp-messages-actions.php (5416 => 5417)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-messages/bp-messages-actions.php 2011-11-29 22:18:26 UTC (rev 5416)
+++ trunk/bp-messages/bp-messages-actions.php 2011-11-29 23:06:58 UTC (rev 5417)
</span><span class="lines">@@ -17,7 +17,7 @@
</span><span class="cx"> $thread_id = (int)bp_action_variable( 0 );
</span><span class="cx">
</span><span class="cx"> if ( !$thread_id || !messages_is_valid_thread( $thread_id ) || ( !messages_check_thread_access( $thread_id ) && !bp_current_user_can( 'bp_moderate' ) ) )
</span><del>- bp_core_redirect( bp_displayed_user_domain() . bp_get_messages_slug() );
</del><ins>+ bp_core_redirect( trailingslashit( bp_displayed_user_domain() . bp_get_messages_slug() ) );
</ins><span class="cx">
</span><span class="cx"> // Check if a new reply has been submitted
</span><span class="cx"> if ( isset( $_POST['send'] ) ) {
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> 'screen_function' => true,
</span><span class="cx"> 'position' => 40,
</span><span class="cx"> 'user_has_access' => bp_is_my_profile(),
</span><del>- 'link' => bp_displayed_user_domain() . bp_get_messages_slug() . '/view/' . (int) $thread_id
</del><ins>+ 'link' => trailingslashit( bp_displayed_user_domain() . bp_get_messages_slug() . '/view/' . (int) $thread_id )
</ins><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> bp_core_load_template( apply_filters( 'messages_template_view_message', 'members/single/home' ) );
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> $thread_id = bp_action_variable( 1 );
</span><span class="cx">
</span><span class="cx"> if ( !$thread_id || !is_numeric( $thread_id ) || !messages_check_thread_access( $thread_id ) ) {
</span><del>- bp_core_redirect( bp_displayed_user_domain() . bp_get_messages_slug() . '/' . bp_current_action() );
</del><ins>+ bp_core_redirect( trailingslashit( bp_displayed_user_domain() . bp_get_messages_slug() . '/' . bp_current_action() ) );
</ins><span class="cx"> } else {
</span><span class="cx"> if ( !check_admin_referer( 'messages_delete_thread' ) )
</span><span class="cx"> return false;
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> } else {
</span><span class="cx"> bp_core_add_message( __('Message deleted.', 'buddypress') );
</span><span class="cx"> }
</span><del>- bp_core_redirect( bp_displayed_user_domain() . bp_get_messages_slug() . '/' . bp_current_action() );
</del><ins>+ bp_core_redirect( trailingslashit( bp_displayed_user_domain() . bp_get_messages_slug() . '/' . bp_current_action() ) );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> add_action( 'bp_actions', 'messages_action_delete_message' );
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> $thread_ids = $_POST['thread_ids'];
</span><span class="cx">
</span><span class="cx"> if ( !$thread_ids || !messages_check_thread_access( $thread_ids ) ) {
</span><del>- bp_core_redirect( bp_displayed_user_domain() . bp_get_messages_slug() . '/' . bp_current_action() );
</del><ins>+ bp_core_redirect( trailingslashit( bp_displayed_user_domain() . bp_get_messages_slug() . '/' . bp_current_action() ) );
</ins><span class="cx"> } else {
</span><span class="cx"> if ( !check_admin_referer( 'messages_delete_thread' ) )
</span><span class="cx"> return false;
</span><span class="lines">@@ -103,7 +103,7 @@
</span><span class="cx"> else
</span><span class="cx"> bp_core_add_message( __('Messages deleted.', 'buddypress') );
</span><span class="cx">
</span><del>- bp_core_redirect( bp_displayed_user_domain() . bp_get_messages_slug() . '/' . bp_current_action() );
</del><ins>+ bp_core_redirect( trailingslashit( bp_displayed_user_domain() . bp_get_messages_slug() . '/' . bp_current_action() ) );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> add_action( 'bp_actions', 'messages_action_bulk_delete' );
</span></span></pre></div>
<a id="trunkbpmessagesbpmessagesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-messages/bp-messages-functions.php (5416 => 5417)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-messages/bp-messages-functions.php 2011-11-29 22:18:26 UTC (rev 5416)
+++ trunk/bp-messages/bp-messages-functions.php 2011-11-29 23:06:58 UTC (rev 5417)
</span><span class="lines">@@ -233,7 +233,7 @@
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><span class="cx"> if ( 'new_message' == $action ) {
</span><del>- $link = bp_loggedin_user_domain() . bp_get_messages_slug() . '/inbox';
</del><ins>+ $link = trailingslashit( bp_loggedin_user_domain() . bp_get_messages_slug() . '/inbox' );
</ins><span class="cx"> $title = __( 'Inbox', 'buddypress' );
</span><span class="cx">
</span><span class="cx"> if ( (int)$total_items > 1 ) {
</span></span></pre></div>
<a id="trunkbpmessagesbpmessagesscreensphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-messages/bp-messages-screens.php (5416 => 5417)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-messages/bp-messages-screens.php 2011-11-29 22:18:26 UTC (rev 5416)
+++ trunk/bp-messages/bp-messages-screens.php 2011-11-29 23:06:58 UTC (rev 5417)
</span><span class="lines">@@ -114,7 +114,7 @@
</span><span class="cx"> bp_core_add_message( __('Notice deleted.', 'buddypress') );
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- bp_core_redirect( bp_loggedin_user_domain() . bp_get_messages_slug() . '/notices' );
</del><ins>+ bp_core_redirect( trailingslashit( bp_loggedin_user_domain() . bp_get_messages_slug() . '/notices' ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( bp_action_variables() ) {
</span></span></pre></div>
<a id="trunkbpmessagesbpmessagestemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-messages/bp-messages-template.php (5416 => 5417)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-messages/bp-messages-template.php 2011-11-29 22:18:26 UTC (rev 5416)
+++ trunk/bp-messages/bp-messages-template.php 2011-11-29 23:06:58 UTC (rev 5417)
</span><span class="lines">@@ -254,7 +254,7 @@
</span><span class="cx"> }
</span><span class="cx"> function bp_get_message_thread_delete_link() {
</span><span class="cx"> global $messages_template, $bp;
</span><del>- return apply_filters( 'bp_get_message_thread_delete_link', wp_nonce_url( $bp->loggedin_user->domain . $bp->messages->slug . '/' . $bp->current_action . '/delete/' . $messages_template->thread->thread_id, 'messages_delete_thread' ) );
</del><ins>+ return apply_filters( 'bp_get_message_thread_delete_link', wp_nonce_url( trailingslashit( $bp->loggedin_user->domain . $bp->messages->slug . '/' . $bp->current_action . '/delete/' . $messages_template->thread->thread_id ), 'messages_delete_thread' ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_message_css_class() {
</span><span class="lines">@@ -479,9 +479,9 @@
</span><span class="cx"> global $messages_template, $bp;
</span><span class="cx">
</span><span class="cx"> if ( 1 == (int)$messages_template->thread->is_active ) {
</span><del>- $link = wp_nonce_url( $bp->loggedin_user->domain . $bp->messages->slug . '/notices/deactivate/' . $messages_template->thread->id, 'messages_deactivate_notice' );
</del><ins>+ $link = wp_nonce_url( trailingslashit( $bp->loggedin_user->domain . $bp->messages->slug . '/notices/deactivate/' . $messages_template->thread->id ), 'messages_deactivate_notice' );
</ins><span class="cx"> } else {
</span><del>- $link = wp_nonce_url( $bp->loggedin_user->domain . $bp->messages->slug . '/notices/activate/' . $messages_template->thread->id, 'messages_activate_notice' );
</del><ins>+ $link = wp_nonce_url( trailingslashit( $bp->loggedin_user->domain . $bp->messages->slug . '/notices/activate/' . $messages_template->thread->id ), 'messages_activate_notice' );
</ins><span class="cx"> }
</span><span class="cx"> return apply_filters( 'bp_get_message_activate_deactivate_link', $link );
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>