<!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] [2814] branches/1.2/bp-activity.php: Fixes #2104</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2814</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-03-08 13:57:01 +0000 (Mon, 08 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes #2104</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches12bpactivityphp">branches/1.2/bp-activity.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches12bpactivityphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-activity.php (2813 => 2814)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-activity.php 2010-03-05 20:10:43 UTC (rev 2813)
+++ branches/1.2/bp-activity.php 2010-03-08 13:57:01 UTC (rev 2814)
</span><span class="lines">@@ -247,7 +247,11 @@
</span><span class="cx">
</span><span class="cx"> if ( !$has_access ) {
</span><span class="cx"> bp_core_add_message( __( 'You do not have access to this activity.', 'buddypress' ), 'error' );
</span><del>- bp_core_redirect( $bp->loggedin_user->domain );
</del><ins>+
+ if ( is_user_logged_in() )
+ bp_core_redirect( $bp->loggedin_user->domain );
+ else
+ bp_core_redirect( $bp->root_domain );
</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 class="lines">@@ -311,19 +315,21 @@
</span><span class="cx"> /* Redirect based on the type of activity */
</span><span class="cx"> if ( $activity->component == $bp->groups->id ) {
</span><span class="cx"> if ( $activity->user_id )
</span><del>- $redirect = bp_core_get_user_domain( $activity->user_id, $activity->user_nicename, $activity->user_login ) . $bp->activity->slug . '/' . $activity->id;
</del><ins>+ $redirect = bp_core_get_user_domain( $activity->user_id, $activity->user_nicename, $activity->user_login ) . $bp->activity->slug . '/' . $activity->id . '/';
</ins><span class="cx"> else {
</span><span class="cx"> if ( $group = groups_get_group( array( 'group_id' => $activity->item_id ) ) )
</span><del>- $redirect = bp_get_group_permalink( $group ) . $bp->activity->slug . '/' . $activity->id;
</del><ins>+ $redirect = bp_get_group_permalink( $group ) . $bp->activity->slug . '/' . $activity->id . '/';
</ins><span class="cx"> }
</span><span class="cx"> } else
</span><span class="cx"> $redirect = bp_core_get_user_domain( $activity->user_id, $activity->user_nicename, $activity->user_login ) . $bp->activity->slug . '/' . $activity->id;
</span><span class="cx">
</span><ins>+ $redirect = apply_filters( 'bp_activity_permalink_redirect_url', $redirect, &$activity );
+
</ins><span class="cx"> if ( !$redirect )
</span><span class="cx"> bp_core_redirect( $bp->root_domain );
</span><span class="cx">
</span><span class="cx"> /* Redirect to the actual activity permalink page */
</span><del>- bp_core_redirect( apply_filters( 'bp_activity_action_permalink_url', $redirect . '/', &$activity ) );
</del><ins>+ bp_core_redirect( $redirect );
</ins><span class="cx"> }
</span><span class="cx"> add_action( 'wp', 'bp_activity_action_permalink_router', 3 );
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>