<!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][8818] trunk/src: Do not add "new_member" activities if xProfile component is disabled</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/8818">8818</a></dd>
<dt>Author</dt> <dd>imath</dd>
<dt>Date</dt> <dd>2014-08-12 21:31:40 +0000 (Tue, 12 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Do not add "new_member" activities if xProfile component is disabled
In Members component, bp_core_new_user_activity() automatically creates an "xProfile" activity item ("new_member" type) as soon as a user account is activated. If this happens when the xProfile component is disabled, the proper activity action callback is not available, as a result an empty string is saved in the action field of the activity table. On front-end and back-end, these mini activities are displayed without any actions.
This is a temporary fix for 2.1, we will think about something more substantial for 2.2.
See <a href="http://buddypress.trac.wordpress.org/ticket/5807">#5807</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpactivitybpactivityclassesphp">trunk/src/bp-activity/bp-activity-classes.php</a></li>
<li><a href="#trunksrcbpmembersbpmembersfunctionsphp">trunk/src/bp-members/bp-members-functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpactivitybpactivityclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-activity/bp-activity-classes.php (8817 => 8818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-activity/bp-activity-classes.php 2014-08-12 21:04:05 UTC (rev 8817)
+++ trunk/src/bp-activity/bp-activity-classes.php 2014-08-12 21:31:40 UTC (rev 8818)
</span><span class="lines">@@ -333,6 +333,9 @@
</span><span class="cx"> // Where conditions
</span><span class="cx"> $where_conditions = array();
</span><span class="cx">
</span><ins>+ // Excluded types
+ $excluded_types = array();
+
</ins><span class="cx"> // Spam
</span><span class="cx"> if ( 'ham_only' == $spam )
</span><span class="cx"> $where_conditions['spam_sql'] = 'a.is_spam = 0';
</span><span class="lines">@@ -391,15 +394,26 @@
</span><span class="cx"> // comments in the stream like normal comments or threaded below
</span><span class="cx"> // the activity.
</span><span class="cx"> if ( false === $display_comments || 'threaded' === $display_comments ) {
</span><del>- $where_conditions[] = "a.type != 'activity_comment'";
</del><ins>+ $excluded_types[] = 'activity_comment';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Exclude 'last_activity' items unless the 'action' filter has
</span><span class="cx"> // been explicitly set
</span><span class="cx"> if ( empty( $filter['object'] ) ) {
</span><del>- $where_conditions[] = "a.type != 'last_activity'";
</del><ins>+ $excluded_types[] = 'last_activity';
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ // Exclude 'new_member' items if xprofile component is not active
+ if ( ! bp_is_active( 'xprofile' ) ) {
+ $excluded_types[] = 'new_member';
+ }
+
+ // Build the excluded type sql part
+ if ( ! empty( $excluded_types ) ) {
+ $not_in = "'" . implode( "', '", esc_sql( $excluded_types ) ) . "'";
+ $where_conditions['excluded_types'] = "a.type NOT IN ({$not_in})";
+ }
+
</ins><span class="cx"> // Filter the where conditions
</span><span class="cx"> $where_conditions = apply_filters( 'bp_activity_get_where_conditions', $where_conditions, $r, $select_sql, $from_sql, $join_sql );
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcbpmembersbpmembersfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-members/bp-members-functions.php (8817 => 8818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-members/bp-members-functions.php 2014-08-12 21:04:05 UTC (rev 8817)
+++ trunk/src/bp-members/bp-members-functions.php 2014-08-12 21:31:40 UTC (rev 8818)
</span><span class="lines">@@ -1850,7 +1850,7 @@
</span><span class="cx"> * @param array $user Array of userdata passed to bp_core_activated_user hook.
</span><span class="cx"> */
</span><span class="cx"> function bp_core_new_user_activity( $user ) {
</span><del>- if ( empty( $user ) || ! bp_is_active( 'activity' ) ) {
</del><ins>+ if ( empty( $user ) || ! bp_is_active( 'activity' ) || ! bp_is_active( 'xprofile' ) ) {
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>