<!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][8589] trunk/src: Add return values to `bp_blogs_record_existing_blogs()` add use them in a new blog meta data recording repair tool.</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">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/8589">8589</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2014-07-10 22:22:16 +0000 (Thu, 10 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add return values to `bp_blogs_record_existing_blogs()` add use them in a new blog meta data recording repair tool. See <a href="http://buddypress.trac.wordpress.org/ticket/5749">#5749</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpblogsbpblogsfunctionsphp">trunk/src/bp-blogs/bp-blogs-functions.php</a></li>
<li><a href="#trunksrcbpcoreadminbpcoretoolsphp">trunk/src/bp-core/admin/bp-core-tools.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpblogsbpblogsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-blogs/bp-blogs-functions.php (8588 => 8589)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-blogs/bp-blogs-functions.php 2014-07-10 20:24:23 UTC (rev 8588)
+++ trunk/src/bp-blogs/bp-blogs-functions.php 2014-07-10 22:22:16 UTC (rev 8589)
</span><span class="lines">@@ -78,6 +78,11 @@
</span><span class="cx"> if ( ! wp_is_large_network() ) {
</span><span class="cx"> $blog_ids = $wpdb->get_col( $wpdb->prepare( "SELECT blog_id FROM {$wpdb->base_prefix}blogs WHERE mature = 0 AND spam = 0 AND deleted = 0 AND site_id = %d", $wpdb->siteid ) );
</span><span class="cx">
</span><ins>+ // If error running this query, set blog ID's to false
+ if ( is_wp_error( $blog_ids ) ) {
+ $blog_ids = false;
+ }
+
</ins><span class="cx"> // Large networks are not currently supported
</span><span class="cx"> } else {
</span><span class="cx"> $blog_ids = false;
</span><span class="lines">@@ -90,13 +95,21 @@
</span><span class="cx">
</span><span class="cx"> // Bail if there are no blogs in the network
</span><span class="cx"> if ( empty( $blog_ids ) ) {
</span><del>- return;
</del><ins>+ return false;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- // Truncate user blogs table and re-record.
- $wpdb->query( "TRUNCATE {$bp->blogs->table_name}" );
- $wpdb->query( "TRUNCATE {$bp->blogs->table_name_blogmeta}" );
</del><ins>+ // Truncate user blogs table
+ $truncate = $wpdb->query( "TRUNCATE {$bp->blogs->table_name}" );
+ if ( is_wp_error( $truncate ) ) {
+ return false;
+ }
</ins><span class="cx">
</span><ins>+ // Truncate user blogsmeta table
+ $truncate = $wpdb->query( "TRUNCATE {$bp->blogs->table_name_blogmeta}" );
+ if ( is_wp_error( $truncate ) ) {
+ return false;
+ }
+
</ins><span class="cx"> // Loop through users of blogs and record the relationship
</span><span class="cx"> foreach ( (array) $blog_ids as $blog_id ) {
</span><span class="cx">
</span><span class="lines">@@ -129,6 +142,9 @@
</span><span class="cx"> bp_blogs_record_blog( $blog_id, $user, true );
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+ // No errors
+ return true;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunksrcbpcoreadminbpcoretoolsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-core/admin/bp-core-tools.php (8588 => 8589)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-core/admin/bp-core-tools.php 2014-07-10 20:24:23 UTC (rev 8588)
+++ trunk/src/bp-core/admin/bp-core-tools.php 2014-07-10 22:22:16 UTC (rev 8589)
</span><span class="lines">@@ -132,6 +132,16 @@
</span><span class="cx"> );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // Blogs:
+ // - user blog count
+ if ( bp_is_active( 'blogs' ) ) {
+ $repair_list[90] = array(
+ 'bp-blog-records',
+ __( 'Repopulate blogs records', 'buddypress' ),
+ 'bp_admin_repair_blog_records',
+ );
+ }
+
</ins><span class="cx"> ksort( $repair_list );
</span><span class="cx">
</span><span class="cx"> return (array) apply_filters( 'bp_repair_list', $repair_list );
</span><span class="lines">@@ -239,6 +249,38 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Recalculate user-to-blog relationships and useful blog meta data
+ *
+ * @since BuddyPress (2.1.0)
+ *
+ * @return array
+ */
+function bp_admin_repair_blog_records() {
+
+ // Description of this tool, dispalyed to the user
+ $statement = __( 'Repopulating Blogs records… %s', 'buddypress' );
+
+ // Default to failure text
+ $result = __( 'Failed!', 'buddypress' );
+
+ // Default to unrepaired
+ $repair = false;
+
+ // Run function if blogs component is active
+ if ( bp_is_active( 'blogs' ) ) {
+ $repair = bp_blogs_record_existing_blogs();
+ }
+
+ // Setup success/fail messaging
+ if ( true === $repair ) {
+ $result = __( 'Complete!', 'buddypress' );
+ }
+
+ // All done!
+ return array( 0, sprintf( $statement, $result ) );
+}
+
+/**
</ins><span class="cx"> * Recalculate the total number of active site members.
</span><span class="cx"> *
</span><span class="cx"> * @since BuddyPress (2.0.0)
</span><span class="lines">@@ -281,7 +323,6 @@
</span><span class="cx"> switch ( count( $errors ) ) {
</span><span class="cx"> case 0:
</span><span class="cx"> return false;
</span><del>- break;
</del><span class="cx">
</span><span class="cx"> case 1:
</span><span class="cx"> $message = '<p>' . $errors[0] . '</p>';
</span></span></pre>
</div>
</div>
</body>
</html>