<!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] [2542] trunk: Fixes #1767</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2542</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-02-02 18:29:33 +0000 (Tue, 02 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes #1767</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivityphp">trunk/bp-activity.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="trunkbpactivityphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity.php (2541 => 2542)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity.php 2010-02-02 17:59:55 UTC (rev 2541)
+++ trunk/bp-activity.php 2010-02-02 18:29:33 UTC (rev 2542)
</span><span class="lines">@@ -332,24 +332,21 @@
</span><span class="cx"> check_admin_referer( 'bp_activity_delete_link' );
</span><span class="cx">
</span><span class="cx"> $activity_id = $bp->action_variables[0];
</span><ins>+ $activity = new BP_Activity_Activity( $activity_id );
</ins><span class="cx">
</span><span class="cx"> /* Check access */
</span><del>- if ( !is_site_admin() ) {
- $activity = new BP_Activity_Activity( $activity_id );
</del><ins>+ if ( !is_site_admin() && $activity->user_id != $bp->loggedin_user->id )
+ return false;
</ins><span class="cx">
</span><del>- if ( $activity->user_id != $bp->loggedin_user->id )
- return false;
- }
-
</del><span class="cx"> /* Now delete the activity item */
</span><del>- if ( bp_activity_delete_by_activity_id( $activity_id ) )
</del><ins>+ if ( bp_activity_delete( array( 'id' => $activity_id, 'user_id' => $activity->user_id ) ) )
</ins><span class="cx"> bp_core_add_message( __( 'Activity deleted', 'buddypress' ) );
</span><span class="cx"> else
</span><span class="cx"> bp_core_add_message( __( 'There was an error when deleting that activity', 'buddypress' ), 'error' );
</span><span class="cx">
</span><span class="cx"> do_action( 'bp_activity_action_delete_activity', $activity_id );
</span><span class="cx">
</span><del>- bp_core_redirect( $_SERVER['HTTP_REFERER'] );
</del><ins>+ bp_core_redirect( wp_get_referer() );
</ins><span class="cx"> }
</span><span class="cx"> add_action( 'wp', 'bp_activity_action_delete_activity', 3 );
</span><span class="cx">
</span><span class="lines">@@ -696,6 +693,18 @@
</span><span class="cx"> if ( !$activity_ids_deleted = BP_Activity_Activity::delete( $args ) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ /* Check if the user's latest update has been deleted */
+ if ( empty( $args['user_id'] ) )
+ $user_id = $bp->loggedin_user->id;
+ else
+ $user_id = $args['user_id'];
+
+ $latest_update = get_usermeta( $user_id, 'bp_latest_update' );
+ if ( !empty( $latest_update ) ) {
+ if ( in_array( (int)$latest_update['id'], (array)$activity_ids_deleted ) )
+ delete_usermeta( $user_id, 'bp_latest_update' );
+ }
+
</ins><span class="cx"> do_action( 'bp_activity_delete', $args );
</span><span class="cx"> do_action( 'bp_activity_deleted_activities', $activity_ids_deleted );
</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 (2541 => 2542)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/ajax.php 2010-02-02 17:59:55 UTC (rev 2541)
+++ trunk/bp-themes/bp-default/_inc/ajax.php 2010-02-02 18:29:33 UTC (rev 2542)
</span><span class="lines">@@ -155,7 +155,13 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( empty( $_POST['id'] ) || !is_numeric( $_POST['id'] ) || !bp_activity_delete( array( 'id' => $_POST['id'] ) ) ) {
</del><ins>+ $activity = new BP_Activity_Activity( $_POST['id'] );
+
+ /* Check access */
+ if ( !is_site_admin() && $activity->user_id != $bp->loggedin_user->id )
+ return false;
+
+ if ( empty( $_POST['id'] ) || !is_numeric( $_POST['id'] ) || !bp_activity_delete( array( 'id' => $_POST['id'], 'user_id' => $activity->user_id ) ) ) {
</ins><span class="cx"> echo '-1<div id="message" class="error"><p>' . __( 'There was a problem when deleting. Please try again.', 'buddypress' ) . '</p></div>';
</span><span class="cx"> return false;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>