<!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][8124] trunk: Introduce tool on Tools menu for repairing last_activity data</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/8124">8124</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2014-03-13 11:45:17 +0000 (Thu, 13 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Introduce tool on Tools menu for repairing last_activity data
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/5461">#5461</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcoreadminbpcoretoolsphp">trunk/bp-core/admin/bp-core-tools.php</a></li>
<li><a href="#trunkbpcorebpcoreupdatephp">trunk/bp-core/bp-core-update.php</a></li>
<li><a href="#trunkbpmembersbpmembersfunctionsphp">trunk/bp-members/bp-members-functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcoreadminbpcoretoolsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/admin/bp-core-tools.php (8123 => 8124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/admin/bp-core-tools.php 2014-03-13 11:32:46 UTC (rev 8123)
+++ trunk/bp-core/admin/bp-core-tools.php 2014-03-13 11:45:17 UTC (rev 8124)
</span><span class="lines">@@ -95,16 +95,23 @@
</span><span class="cx"> * @return array
</span><span class="cx"> */
</span><span class="cx"> function bp_admin_repair_list() {
</span><ins>+ $repair_list = array();
+
</ins><span class="cx"> // Members:
</span><span class="cx"> // - member count
</span><del>- $repair_list = array(
- 20 => array(
- 'bp-total-member-count',
- __( 'Count total members', 'buddypress' ),
- 'bp_admin_repair_count_members',
- ),
</del><ins>+ // - last_activity migration (2.0)
+ $repair_list[20] = array(
+ 'bp-total-member-count',
+ __( 'Count total members', 'buddypress' ),
+ 'bp_admin_repair_count_members',
</ins><span class="cx"> );
</span><span class="cx">
</span><ins>+ $repair_list[25] = array(
+ 'bp-last-activity',
+ __( 'Repair user "last activity" data', 'buddypress' ),
+ 'bp_admin_repair_last_activity',
+ );
+
</ins><span class="cx"> // Friends:
</span><span class="cx"> // - user friend count
</span><span class="cx"> if ( bp_is_active( 'friends' ) ) {
</span><span class="lines">@@ -244,6 +251,19 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Repair user last_activity data.
+ *
+ * Re-runs the migration from usermeta introduced in BP 2.0.
+ *
+ * @since BuddyPress (2.0.0)
+ */
+function bp_admin_repair_last_activity() {
+ $statement = __( 'Determining last activity dates for each user… %s', 'buddypress' );
+ bp_last_activity_migrate();
+ return array( 0, sprintf( $statement, __( 'Complete!', 'buddypress' ) ) );
+}
+
+/**
</ins><span class="cx"> * Assemble admin notices relating success/failure of repair processes.
</span><span class="cx"> *
</span><span class="cx"> * @since BuddyPress (2.0.0)
</span></span></pre></div>
<a id="trunkbpcorebpcoreupdatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-update.php (8123 => 8124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-update.php 2014-03-13 11:32:46 UTC (rev 8123)
+++ trunk/bp-core/bp-core-update.php 2014-03-13 11:45:17 UTC (rev 8124)
</span><span class="lines">@@ -345,26 +345,10 @@
</span><span class="cx"> /** Install activity tables for 'last_activity' **********************/
</span><span class="cx"> bp_core_install_activity_streams();
</span><span class="cx">
</span><del>- $bp = buddypress();
-
</del><span class="cx"> /** Migrate 'last_activity' data *************************************/
</span><span class="cx">
</span><del>- // The "NOT IN" clause prevents duplicates
- $sql = "INSERT INTO {$bp->members->table_name_last_activity} (`user_id`, `component`, `type`, `action`, `content`, `primary_link`, `item_id`, `date_recorded` ) (
- SELECT user_id, '{$bp->members->id}' as component, 'last_activity' as type, '' as action, '' as content, '' as primary_link, 0 as item_id, meta_value AS date_recorded
- FROM {$wpdb->usermeta}
- WHERE
- meta_key = 'last_activity'
- AND
- user_id NOT IN (
- SELECT user_id
- FROM {$bp->members->table_name_last_activity}
- WHERE component = '{$bp->members->id}' AND type = 'last_activity'
- )
- );";
</del><ins>+ bp_last_activity_migrate();
</ins><span class="cx">
</span><del>- $wpdb->query( $sql );
-
</del><span class="cx"> /** Migrate signups data *********************************************/
</span><span class="cx">
</span><span class="cx"> if ( bp_get_signup_allowed() && ! is_multisite() ) {
</span></span></pre></div>
<a id="trunkbpmembersbpmembersfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-members/bp-members-functions.php (8123 => 8124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-members/bp-members-functions.php 2014-03-13 11:32:46 UTC (rev 8123)
+++ trunk/bp-members/bp-members-functions.php 2014-03-13 11:45:17 UTC (rev 8124)
</span><span class="lines">@@ -991,6 +991,36 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Migrate last_activity data from the usermeta table to the activity table.
+ *
+ * Generally, this function is only run when BP is upgraded to 2.0. It can also
+ * be called directly from the BuddyPress Tools panel.
+ *
+ * @since BuddyPress (2.0.0)
+ */
+function bp_last_activity_migrate() {
+ global $wpdb;
+
+ $bp = buddypress();
+
+ // The "NOT IN" clause prevents duplicates
+ $sql = "INSERT INTO {$bp->members->table_name_last_activity} (`user_id`, `component`, `type`, `action`, `content`, `primary_link`, `item_id`, `date_recorded` ) (
+ SELECT user_id, '{$bp->members->id}' as component, 'last_activity' as type, '' as action, '' as content, '' as primary_link, 0 as item_id, meta_value AS date_recorded
+ FROM {$wpdb->usermeta}
+ WHERE
+ meta_key = 'last_activity'
+ AND
+ user_id NOT IN (
+ SELECT user_id
+ FROM {$bp->members->table_name_last_activity}
+ WHERE component = '{$bp->members->id}' AND type = 'last_activity'
+ )
+ );";
+
+ return $wpdb->query( $sql );
+}
+
+/**
</ins><span class="cx"> * Fetch every post that is authored by the given user for the current blog.
</span><span class="cx"> *
</span><span class="cx"> * @package BuddyPress Core
</span></span></pre>
</div>
</div>
</body>
</html>