<!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][5410] trunk: When marking a user as not a spammer, mark all their activity as not spam, too.</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><a href="http://buddypress.trac.wordpress.org/changeset/5410">5410</a></dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2011-11-29 20:45:28 +0000 (Tue, 29 Nov 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>When marking a user as not a spammer, mark all their activity as not spam, too.
Also removes legacy behaviour of changing activities' hide_sitewide when marking a user as a spammer.
See <a href="http://buddypress.trac.wordpress.org/ticket/3660">#3660</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivityfunctionsphp">trunk/bp-activity/bp-activity-functions.php</a></li>
<li><a href="#trunkbpmembersbpmembersactionsphp">trunk/bp-members/bp-members-actions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivitybpactivityfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-functions.php (5409 => 5410)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-functions.php 2011-11-29 20:31:06 UTC (rev 5409)
+++ trunk/bp-activity/bp-activity-functions.php 2011-11-29 20:45:28 UTC (rev 5410)
</span><span class="lines">@@ -660,7 +660,7 @@
</span><span class="cx"> global $bp, $wpdb;
</span><span class="cx">
</span><span class="cx"> // Do not delete user data unless a logged in user says so
</span><del>- if ( empty( $user_id ) || !is_user_logged_in() )
</del><ins>+ if ( empty( $user_id ) || ! is_user_logged_in() )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // Get all the user's activities.
</span><span class="lines">@@ -700,6 +700,57 @@
</span><span class="cx"> add_action( 'bp_make_spam_user', 'bp_activity_spam_all_user_data' );
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Mark all of the user's activity as ham (not spam)
+ *
+ * @global object $wpdb
+ * @global object $bp BuddyPress global settings
+ * @param int $user_id
+ * @since 1.6
+ */
+function bp_activity_ham_all_user_data( $user_id = 0 ) {
+ global $bp, $wpdb;
+
+ // Do not delete user data unless a logged in user says so
+ if ( empty( $user_id ) || ! is_user_logged_in() )
+ return false;
+
+ // Get all the user's activities.
+ $activities = bp_activity_get( array( 'display_comments' => 'stream', 'filter' => array( 'user_id' => $user_id ), 'show_hidden' => true, 'spam' => 'all', ) );
+
+ // Mark each as not spam
+ foreach ( (array) $activities['activities'] as $activity ) {
+
+ // Create an activity object
+ $activity_obj = new BP_Activity_Activity;
+ foreach ( $activity as $k => $v )
+ $activity_obj->$k = $v;
+
+ // Mark as not spam
+ bp_activity_mark_as_ham( $activity_obj );
+
+ /*
+ * If Akismet is present, update the activity history meta.
+ *
+ * This is usually taken care of when BP_Activity_Activity::save() happens, but
+ * as we're going to be updating all the activity statuses directly, for efficency,
+ * we need to update manually.
+ */
+ if ( ! empty( $bp->activity->akismet ) )
+ $bp->activity->akismet->update_activity_ham_meta( $activity_obj );
+
+ // Tidy up
+ unset( $activity_obj );
+ }
+
+ // Mark all of this user's activities as spam
+ $wpdb->query( $wpdb->prepare( "UPDATE {$bp->activity->table_name} SET is_spam = 0 WHERE user_id = %d", $user_id ) );
+
+ // Call an action for plugins to use
+ do_action( 'bp_activity_ham_all_user_data', $user_id, $activities['activities'] );
+}
+add_action( 'bp_make_ham_user', 'bp_activity_ham_all_user_data' );
+
+/**
</ins><span class="cx"> * Register the activity stream actions for updates
</span><span class="cx"> *
</span><span class="cx"> * @since 1.2.0
</span></span></pre></div>
<a id="trunkbpmembersbpmembersactionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-members/bp-members-actions.php (5409 => 5410)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-members/bp-members-actions.php 2011-11-29 20:31:06 UTC (rev 5409)
+++ trunk/bp-members/bp-members-actions.php 2011-11-29 20:45:28 UTC (rev 5410)
</span><span class="lines">@@ -89,11 +89,6 @@
</span><span class="cx"> bp_core_add_message( __( 'User removed as spammer.', 'buddypress' ) );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Hide this user's activity
- if ( $is_spam && bp_is_active( 'activity' ) ) {
- bp_activity_hide_user_activity( $user_id );
- }
-
</del><span class="cx"> // We need a special hook for is_spam so that components can delete data at spam time
</span><span class="cx"> $bp_action = $is_spam ? 'bp_make_spam_user' : 'bp_make_ham_user';
</span><span class="cx"> do_action( $bp_action, bp_displayed_user_id() );
</span></span></pre>
</div>
</div>
</body>
</html>