<!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][3772] trunk: Add before delete hooks to Friends and Activity components (see #2773).</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>3772</dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2011-01-20 18:25:30 +0000 (Thu, 20 Jan 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add before delete hooks to Friends and Activity components (see #2773). Props kunalb</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivityactionsphp">trunk/bp-activity/bp-activity-actions.php</a></li>
<li><a href="#trunkbpactivitybpactivityfunctionsphp">trunk/bp-activity/bp-activity-functions.php</a></li>
<li><a href="#trunkbpfriendsbpfriendsloaderphp">trunk/bp-friends/bp-friends-loader.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="trunkbpactivitybpactivityactionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-actions.php (3771 => 3772)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-actions.php 2011-01-20 13:50:21 UTC (rev 3771)
+++ trunk/bp-activity/bp-activity-actions.php 2011-01-20 18:25:30 UTC (rev 3772)
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // Call the action before the delete so plugins can still fetch information about it
</span><del>- do_action( 'bp_activity_action_delete_activity', $activity_id, $activity->user_id );
</del><ins>+ do_action( 'bp_activity_before_action_delete_activity', $activity_id, $activity->user_id );
</ins><span class="cx">
</span><span class="cx"> // Delete the activity item and provide user feedback
</span><span class="cx"> if ( bp_activity_delete( array( 'id' => $activity_id, 'user_id' => $activity->user_id ) ) )
</span><span class="lines">@@ -94,6 +94,8 @@
</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><ins>+ do_action( 'bp_activity_action_delete_activity', $activity_id, $activity->user_id );
+
</ins><span class="cx"> // Redirect
</span><span class="cx"> bp_core_redirect( wp_get_referer() );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbpactivitybpactivityfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-functions.php (3771 => 3772)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-functions.php 2011-01-20 13:50:21 UTC (rev 3771)
+++ trunk/bp-activity/bp-activity-functions.php 2011-01-20 18:25:30 UTC (rev 3772)
</span><span class="lines">@@ -770,6 +770,8 @@
</span><span class="cx"> else
</span><span class="cx"> $user_id = $args['user_id'];
</span><span class="cx">
</span><ins>+ do_action( 'bp_before_activity_delete', $args );
+
</ins><span class="cx"> $latest_update = get_user_meta( $user_id, 'bp_latest_update', true );
</span><span class="cx"> if ( !empty( $latest_update ) ) {
</span><span class="cx"> if ( in_array( (int)$latest_update['id'], (array)$activity_ids_deleted ) )
</span></span></pre></div>
<a id="trunkbpfriendsbpfriendsloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-friends/bp-friends-loader.php (3771 => 3772)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-friends/bp-friends-loader.php 2011-01-20 13:50:21 UTC (rev 3771)
+++ trunk/bp-friends/bp-friends-loader.php 2011-01-20 18:25:30 UTC (rev 3772)
</span><span class="lines">@@ -379,6 +379,8 @@
</span><span class="cx"> $friendship_id = BP_Friends_Friendship::get_friendship_id( $initiator_userid, $friend_userid );
</span><span class="cx"> $friendship = new BP_Friends_Friendship( $friendship_id );
</span><span class="cx">
</span><ins>+ do_action( 'friends_before_friendship_delete', $friendship_id, $initiator_userid, $friend_userid );
+
</ins><span class="cx"> // Remove the activity stream item for the user who canceled the friendship
</span><span class="cx"> friends_delete_activity( array( 'item_id' => $friendship_id, 'type' => 'friendship_accepted', 'user_id' => $bp->displayed_user->id ) );
</span><span class="cx">
</span><span class="lines">@@ -589,6 +591,8 @@
</span><span class="cx"> function friends_remove_data( $user_id ) {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><ins>+ do_action( 'friends_before_remove_data', $user_id );
+
</ins><span class="cx"> BP_Friends_Friendship::delete_all_for_user($user_id);
</span><span class="cx">
</span><span class="cx"> // Remove usermeta
</span></span></pre></div>
<a id="trunkbpthemesbpdefault_incajaxphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/ajax.php (3771 => 3772)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/ajax.php 2011-01-20 13:50:21 UTC (rev 3771)
+++ trunk/bp-themes/bp-default/_inc/ajax.php 2011-01-20 18:25:30 UTC (rev 3772)
</span><span class="lines">@@ -244,13 +244,15 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // Call the action before the delete so plugins can still fetch information about it
</span><del>- do_action( 'bp_activity_action_delete_activity', $_POST['id'], $activity->user_id );
</del><ins>+ do_action( 'bp_activity_before_action_delete_activity', $_POST['id'], $activity->user_id );
</ins><span class="cx">
</span><span class="cx"> if ( !bp_activity_delete( array( 'id' => $_POST['id'], 'user_id' => $activity->user_id ) ) ) {
</span><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 class="cx">
</span><ins>+ do_action( 'bp_activity_action_delete_activity', $_POST['id'], $activity->user_id );
+
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> add_action( 'wp_ajax_delete_activity', 'bp_dtheme_delete_activity' );
</span><span class="lines">@@ -277,13 +279,15 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> /* Call the action before the delete so plugins can still fetch information about it */
</span><del>- do_action( 'bp_activity_action_delete_activity', $_POST['id'], $comment->user_id );
</del><ins>+ do_action( 'bp_activity_before_action_delete_activity', $_POST['id'], $comment->user_id );
</ins><span class="cx">
</span><span class="cx"> if ( !bp_activity_delete_comment( $comment->item_id, $comment->id ) ) {
</span><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 class="cx">
</span><ins>+ do_action( 'bp_activity_action_delete_activity', $_POST['id'], $comment->user_id );
+
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> add_action( 'wp_ajax_delete_activity_comment', 'bp_dtheme_delete_activity_comment' );
</span></span></pre>
</div>
</div>
</body>
</html>