<!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] [3434] trunk: Fires custom BP hook when user is marked as spam
, in order to account for instances where Network is not enabled.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>3434</dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2010-11-17 03:23:04 +0000 (Wed, 17 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fires custom BP hook when user is marked as spam, in order to account for instances where Network is not enabled. Fixes #1975</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivityphp">trunk/bp-activity.php</a></li>
<li><a href="#trunkbpblogsphp">trunk/bp-blogs.php</a></li>
<li><a href="#trunkbpcorephp">trunk/bp-core.php</a></li>
<li><a href="#trunkbpfriendsphp">trunk/bp-friends.php</a></li>
<li><a href="#trunkbpxprofilephp">trunk/bp-xprofile.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivityphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity.php (3433 => 3434)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity.php 2010-11-16 22:55:54 UTC (rev 3433)
+++ trunk/bp-activity.php 2010-11-17 03:23:04 UTC (rev 3434)
</span><span class="lines">@@ -1159,7 +1159,7 @@
</span><span class="cx"> }
</span><span class="cx"> add_action( 'wpmu_delete_user', 'bp_activity_remove_data' );
</span><span class="cx"> add_action( 'delete_user', 'bp_activity_remove_data' );
</span><del>-add_action( 'make_spam_user', 'bp_activity_remove_data' );
</del><ins>+add_action( 'bp_make_spam_user', 'bp_activity_remove_data' );
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * updates_register_activity_actions()
</span></span></pre></div>
<a id="trunkbpblogsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-blogs.php (3433 => 3434)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-blogs.php 2010-11-16 22:55:54 UTC (rev 3433)
+++ trunk/bp-blogs.php 2010-11-17 03:23:04 UTC (rev 3434)
</span><span class="lines">@@ -716,7 +716,7 @@
</span><span class="cx"> }
</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><del>-add_action( 'make_spam_user', 'bp_blogs_remove_data' );
</del><ins>+add_action( 'bp_make_spam_user', 'bp_blogs_remove_data' );
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> /********************************************************************************
</span></span></pre></div>
<a id="trunkbpcorephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core.php (3433 => 3434)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core.php 2010-11-16 22:55:54 UTC (rev 3433)
+++ trunk/bp-core.php 2010-11-17 03:23:04 UTC (rev 3434)
</span><span class="lines">@@ -457,7 +457,7 @@
</span><span class="cx"> $wpdb->update( $wpdb->users, array( 'spam' => $is_spam ), array( 'ID' => $bp->displayed_user->id ) );
</span><span class="cx">
</span><span class="cx"> $wpdb->update( $wpdb->users, array( 'user_status' => $is_spam ), array( 'ID' => $bp->displayed_user->id ) );
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( $is_spam )
</span><span class="cx"> bp_core_add_message( __( 'User marked as spammer. Spam users are visible only to site admins.', 'buddypress' ) );
</span><span class="cx"> else
</span><span class="lines">@@ -466,6 +466,10 @@
</span><span class="cx"> /* Hide this user's activity */
</span><span class="cx"> if ( $is_spam && function_exists( 'bp_activity_hide_user_activity' ) )
</span><span class="cx"> bp_activity_hide_user_activity( $bp->displayed_user->id );
</span><ins>+
+ // We need a special hook for is_spam so that components can delete data at spam time
+ if ( $is_spam )
+ do_action( 'bp_make_spam_user', $bp->displayed_user->id );
</ins><span class="cx">
</span><span class="cx"> do_action( 'bp_core_action_set_spammer_status', $bp->displayed_user->id, $is_spam );
</span><span class="cx">
</span><span class="lines">@@ -1911,7 +1915,7 @@
</span><span class="cx"> }
</span><span class="cx"> add_action( 'wpmu_delete_user', 'bp_core_remove_data' );
</span><span class="cx"> add_action( 'delete_user', 'bp_core_remove_data' );
</span><del>-add_action( 'make_spam_user', 'bp_core_remove_data' );
</del><ins>+add_action( 'bp_make_spam_user', 'bp_core_remove_data' );
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * bp_load_buddypress_textdomain()
</span></span></pre></div>
<a id="trunkbpfriendsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-friends.php (3433 => 3434)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-friends.php 2010-11-16 22:55:54 UTC (rev 3433)
+++ trunk/bp-friends.php 2010-11-17 03:23:04 UTC (rev 3434)
</span><span class="lines">@@ -580,7 +580,7 @@
</span><span class="cx"> }
</span><span class="cx"> add_action( 'wpmu_delete_user', 'friends_remove_data' );
</span><span class="cx"> add_action( 'delete_user', 'friends_remove_data' );
</span><del>-add_action( 'make_spam_user', 'friends_remove_data' );
</del><ins>+add_action( 'bp_make_spam_user', 'friends_remove_data' );
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> /********************************************************************************
</span></span></pre></div>
<a id="trunkbpxprofilephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile.php (3433 => 3434)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile.php 2010-11-16 22:55:54 UTC (rev 3433)
+++ trunk/bp-xprofile.php 2010-11-17 03:23:04 UTC (rev 3434)
</span><span class="lines">@@ -902,7 +902,7 @@
</span><span class="cx"> }
</span><span class="cx"> add_action( 'wpmu_delete_user', 'xprofile_remove_data' );
</span><span class="cx"> add_action( 'delete_user', 'xprofile_remove_data' );
</span><del>-add_action( 'make_spam_user', 'xprofile_remove_data' );
</del><ins>+add_action( 'bp_make_spam_user', 'xprofile_remove_data' );
</ins><span class="cx">
</span><span class="cx"> /*** XProfile Meta ****************************************************/
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>