<!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][9280] trunk: Blogs: when un-spamming a user, restore blog records.</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://buddypress.trac.wordpress.org/changeset/9280">9280</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/9280","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>djpaul</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2014-12-24 21:26:41 +0000 (Wed, 24 Dec 2014)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Blogs: when un-spamming a user, restore blog records.
When marking a user as a spammer, all BuddyPress data is deleted including the user's recorded blog(s). When you ham the user, their profile won't show their blog(s) anymore. This change adds a function to the ham action to re-calculate the user's blogs.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/5857">#5857</a>, props imath, DJPaul.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpblogsbpblogsfunctionsphp">trunk/src/bp-blogs/bp-blogs-functions.php</a></li>
<li><a href="#trunktestsphpunittestcasesblogsfunctionsphp">trunk/tests/phpunit/testcases/blogs/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpblogsbpblogsfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-blogs/bp-blogs-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-blogs/bp-blogs-functions.php 2014-12-24 21:07:04 UTC (rev 9279)
+++ trunk/src/bp-blogs/bp-blogs-functions.php 2014-12-24 21:26:41 UTC (rev 9280)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1422,3 +1422,29 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wpmu_delete_user', 'bp_blogs_remove_data' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'delete_user', 'bp_blogs_remove_data' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'bp_make_spam_user', 'bp_blogs_remove_data' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+/**
+ * Restore all blog associations for a given user
+ *
+ * @since BuddyPress (2.2.0)
+ *
+ * @param int $user_id ID whose blog data should be restored.
+ */
+function bp_blogs_restore_data( $user_id = 0 ) {
+ if ( ! is_multisite() ) {
+ return;
+ }
+
+ // Get the user's blogs
+ $user_blogs = get_blogs_of_user( $user_id );
+ if ( empty( $user_blogs ) ) {
+ return;
+ }
+
+ $blogs = array_keys( $user_blogs );
+
+ foreach ( $blogs as $blog_id ) {
+ bp_blogs_add_user_to_blog( $user_id, false, $blog_id );
+ }
+}
+add_action( 'bp_make_ham_user', 'bp_blogs_restore_data', 10, 1 );
</ins></span></pre></div>
<a id="trunktestsphpunittestcasesblogsfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/testcases/blogs/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/blogs/functions.php 2014-12-24 21:07:04 UTC (rev 9279)
+++ trunk/tests/phpunit/testcases/blogs/functions.php 2014-12-24 21:26:41 UTC (rev 9280)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -280,6 +280,45 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @group bp_blogs_restore_data
+ */
+ public function test_bp_blogs_restore_data() {
+ if ( ! is_multisite() ) {
+ return;
+ }
+
+ // Create a regular member
+ $u = $this->factory->user->create();
+
+ // Create blogs
+ $b1 = $this->factory->blog->create( array( 'user_id' => $u ) );
+ $b2 = $this->factory->blog->create( array( 'user_id' => $u ) );
+
+ $expected = array(
+ $b1 => $b1,
+ $b2 => $b2
+ );
+
+ // Mark the user as spam
+ bp_core_process_spammer_status( $u, 'spam' );
+
+ // get all blogs for user
+ $blogs = bp_blogs_get_blogs_for_user( $u, true );
+ $blog_ids = wp_list_pluck( $blogs['blogs'], 'blog_id' );
+
+ $this->assertNotEquals( $expected, array_map( 'intval', $blog_ids ), 'User marked as spam should not have any blog registered' );
+
+ // Ham the user
+ bp_core_process_spammer_status( $u, 'ham' );
+
+ // get all blogs for user
+ $blogs = bp_blogs_get_blogs_for_user( $u, true );
+ $blog_ids = wp_list_pluck( $blogs['blogs'], 'blog_id' );
+
+ $this->assertEquals( $expected, array_map( 'intval', $blog_ids ) );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * @group bp_blogs_catch_transition_post_status
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_transition_post_status_publish_to_publish() {
</span></span></pre>
</div>
</div>
</body>
</html>