<!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][4397] trunk: Add some more before delete action hooks.</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>4397</dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2011-05-20 18:53:38 +0000 (Fri, 20 May 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add some more before delete action hooks. Fixes #2773</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpblogsbpblogsfunctionsphp">trunk/bp-blogs/bp-blogs-functions.php</a></li>
<li><a href="#trunkbpmembersbpmembersactionsphp">trunk/bp-members/bp-members-actions.php</a></li>
<li><a href="#trunkbpmessagesbpmessagesfunctionsphp">trunk/bp-messages/bp-messages-functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpblogsbpblogsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-blogs/bp-blogs-functions.php (4396 => 4397)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-blogs/bp-blogs-functions.php 2011-05-19 22:24:15 UTC (rev 4396)
+++ trunk/bp-blogs/bp-blogs-functions.php 2011-05-20 18:53:38 UTC (rev 4397)
</span><span class="lines">@@ -318,6 +318,7 @@
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><span class="cx"> $blog_id = (int)$blog_id;
</span><ins>+ do_action( 'bp_blogs_before_remove_blog', $blog_id );
</ins><span class="cx">
</span><span class="cx"> BP_Blogs_Blog::delete_blog_for_all( $blog_id );
</span><span class="cx">
</span><span class="lines">@@ -334,6 +335,8 @@
</span><span class="cx"> $blog_id = (int)$blog_id;
</span><span class="cx"> $user_id = (int)$user_id;
</span><span class="cx">
</span><ins>+ do_action( 'bp_blogs_before_remove_blog_for_user', $blog_id, $user_id );
+
</ins><span class="cx"> BP_Blogs_Blog::delete_blog_for_user( $blog_id, $user_id );
</span><span class="cx">
</span><span class="cx"> // Delete activity stream item
</span><span class="lines">@@ -357,6 +360,8 @@
</span><span class="cx"> if ( !$user_id )
</span><span class="cx"> $user_id = $bp->loggedin_user->id;
</span><span class="cx">
</span><ins>+ do_action( 'bp_blogs_before_remove_post', $blog_id, $post_id, $user_id );
+
</ins><span class="cx"> // Delete activity stream item
</span><span class="cx"> bp_blogs_delete_activity( array( 'item_id' => $blog_id, 'secondary_item_id' => $post_id, 'component' => $bp->blogs->slug, 'type' => 'new_blog_post' ) );
</span><span class="cx">
</span><span class="lines">@@ -400,6 +405,8 @@
</span><span class="cx"> function bp_blogs_remove_data_for_blog( $blog_id ) {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><ins>+ do_action( 'bp_blogs_before_remove_data_for_blog', $blog_id );
+
</ins><span class="cx"> // If this is regular blog, delete all data for that blog.
</span><span class="cx"> BP_Blogs_Blog::delete_blog_for_all( $blog_id );
</span><span class="cx">
</span><span class="lines">@@ -528,6 +535,8 @@
</span><span class="cx"> if ( !is_multisite() )
</span><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ do_action( 'bp_blogs_before_remove_data', $user_id );
+
</ins><span class="cx"> // If this is regular blog, delete all data for that blog.
</span><span class="cx"> BP_Blogs_Blog::delete_blogs_for_user( $user_id );
</span><span class="cx">
</span><span class="lines">@@ -536,5 +545,4 @@
</span><span class="cx"> add_action( 'wpmu_delete_user', 'bp_blogs_remove_data' );
</span><span class="cx"> add_action( 'delete_user', 'bp_blogs_remove_data' );
</span><span class="cx"> add_action( 'bp_make_spam_user', 'bp_blogs_remove_data' );
</span><del>-
-?>
</del><ins>+?>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkbpmembersbpmembersactionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-members/bp-members-actions.php (4396 => 4397)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-members/bp-members-actions.php 2011-05-19 22:24:15 UTC (rev 4396)
+++ trunk/bp-members/bp-members-actions.php 2011-05-20 18:53:38 UTC (rev 4397)
</span><span class="lines">@@ -1,5 +1,4 @@
</span><span class="cx"> <?php
</span><del>-
</del><span class="cx"> /*******************************************************************************
</span><span class="cx"> * Action Functions
</span><span class="cx"> *
</span><span class="lines">@@ -100,6 +99,7 @@
</span><span class="cx"> check_admin_referer( 'delete-user' );
</span><span class="cx">
</span><span class="cx"> $errors = false;
</span><ins>+ do_action( 'bp_members_before_action_delete_user', $errors );
</ins><span class="cx">
</span><span class="cx"> if ( bp_core_delete_account( $bp->displayed_user->id ) ) {
</span><span class="cx"> bp_core_add_message( sprintf( __( '%s has been deleted from the system.', 'buddypress' ), $bp->displayed_user->fullname ) );
</span><span class="lines">@@ -135,5 +135,4 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> add_action( 'bp_actions', 'bp_core_get_random_member' );
</span><del>-
-?>
</del><ins>+?>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkbpmessagesbpmessagesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-messages/bp-messages-functions.php (4396 => 4397)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-messages/bp-messages-functions.php 2011-05-19 22:24:15 UTC (rev 4396)
+++ trunk/bp-messages/bp-messages-functions.php 2011-05-20 18:53:38 UTC (rev 4397)
</span><span class="lines">@@ -131,11 +131,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function messages_delete_thread( $thread_ids ) {
</span><ins>+ do_action( 'messages_before_delete_thread', $thread_ids );
</ins><span class="cx">
</span><del>- if ( is_array($thread_ids) ) {
</del><ins>+ if ( is_array( $thread_ids ) ) {
</ins><span class="cx"> $error = 0;
</span><del>- for ( $i = 0; $i < count($thread_ids); $i++ ) {
- if ( !$status = BP_Messages_Thread::delete($thread_ids[$i]) )
</del><ins>+ for ( $i = 0; $i < count( $thread_ids ); $i++ ) {
+ if ( !$status = BP_Messages_Thread::delete( $thread_ids[$i]) )
</ins><span class="cx"> $error = 1;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -146,7 +147,7 @@
</span><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> } else {
</span><del>- if ( !BP_Messages_Thread::delete($thread_ids) )
</del><ins>+ if ( !BP_Messages_Thread::delete( $thread_ids ) )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> do_action( 'messages_delete_thread', $thread_ids );
</span><span class="lines">@@ -224,5 +225,4 @@
</span><span class="cx">
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><del>-
-?>
</del><ins>+?>
</ins><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>