<!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][8800] trunk/src/bp-xprofile/bp-xprofile-activity.php: Add brackets and simplify comparison logic in `bp_xprofile_updated_profile_activity()`.</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/8800">8800</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2014-08-12 12:16:29 +0000 (Tue, 12 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add brackets and simplify comparison logic in `bp_xprofile_updated_profile_activity()`.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpxprofilebpxprofileactivityphp">trunk/src/bp-xprofile/bp-xprofile-activity.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpxprofilebpxprofileactivityphp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-xprofile/bp-xprofile-activity.php (8799 => 8800)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-xprofile/bp-xprofile-activity.php 2014-08-12 12:04:06 UTC (rev 8799)
+++ trunk/src/bp-xprofile/bp-xprofile-activity.php 2014-08-12 12:16:29 UTC (rev 8800)
</span><span class="lines">@@ -233,12 +233,14 @@
</span><span class="cx"> * levels.
</span><span class="cx"> * @return bool True on success, false on failure.
</span><span class="cx"> */
</span><del>-function bp_xprofile_updated_profile_activity( $user_id, $field_ids, $errors, $old_values = array(), $new_values = array() ) {
</del><ins>+function bp_xprofile_updated_profile_activity( $user_id, $field_ids = array(), $errors = false, $old_values = array(), $new_values = array() ) {
+
</ins><span class="cx"> // If there were errors, don't post
</span><span class="cx"> if ( ! empty( $errors ) ) {
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // Bail if activity component is not turned on
</ins><span class="cx"> if ( ! bp_is_active( 'activity' ) ) {
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="lines">@@ -247,9 +249,7 @@
</span><span class="cx"> // related solely to non-public fields
</span><span class="cx"> $public_changes = false;
</span><span class="cx"> foreach ( $new_values as $field_id => $new_value ) {
</span><del>- $old_value = isset( $old_values[ $field_id ] ) ? $old_values[ $field_id ] : '';
- $old_value_value = isset( $old_value['value'] ) ? $old_value['value'] : '';
- $old_value_visibility = isset( $old_value['visibility'] ) ? $old_value['visibility'] : '';
</del><ins>+ $old_value = isset( $old_values[ $field_id ] ) ? $old_values[ $field_id ] : '';
</ins><span class="cx">
</span><span class="cx"> // Don't register changes to private fields
</span><span class="cx"> if ( 'public' !== $new_value['visibility'] ) {
</span><span class="lines">@@ -266,13 +266,14 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( ! $public_changes ) {
</del><ins>+ // Bail if no public changes
+ if ( empty( $public_changes ) ) {
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Throttle to one activity of this type per 2 hours
</span><span class="cx"> $existing = bp_activity_get( array(
</span><del>- 'max' => 1,
</del><ins>+ 'max' => 1,
</ins><span class="cx"> 'filter' => array(
</span><span class="cx"> 'user_id' => $user_id,
</span><span class="cx"> 'object' => buddypress()->profile->id,
</span><span class="lines">@@ -280,32 +281,27 @@
</span><span class="cx"> ),
</span><span class="cx"> ) );
</span><span class="cx">
</span><del>- if ( empty( $existing['activities'] ) ) {
- $throttle = false;
- } else {
- // Default throttle time is 2 hours. Filter to change (in seconds)
</del><ins>+ // Default throttle time is 2 hours. Filter to change (in seconds)
+ if ( ! empty( $existing['activities'] ) ) {
</ins><span class="cx"> $throttle_period = apply_filters( 'bp_xprofile_updated_profile_activity_throttle_time', 60 * 60 * 2 );
</span><del>- $then = strtotime( $existing['activities'][0]->date_recorded );
- $now = strtotime( bp_core_current_time() );
</del><ins>+ $then = strtotime( $existing['activities'][0]->date_recorded );
+ $now = strtotime( bp_core_current_time() );
</ins><span class="cx">
</span><del>- $throttle = ( $now - $then ) < $throttle_period;
</del><ins>+ // Bail if throttled
+ if ( ( $now - $then ) < $throttle_period ) {
+ return false;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if ( $throttle ) {
- return false;
- }
-
</del><span class="cx"> // If we've reached this point, assemble and post the activity item
</span><span class="cx"> $profile_link = trailingslashit( bp_core_get_user_domain( $user_id ) . buddypress()->profile->slug );
</span><span class="cx">
</span><del>- $retval = xprofile_record_activity( array(
</del><ins>+ return (bool) xprofile_record_activity( array(
</ins><span class="cx"> 'user_id' => $user_id,
</span><span class="cx"> 'primary_link' => $profile_link,
</span><span class="cx"> 'component' => buddypress()->profile->id,
</span><span class="cx"> 'type' => 'updated_profile',
</span><span class="cx"> ) );
</span><del>-
- return (bool) $retval;
</del><span class="cx"> }
</span><span class="cx"> add_action( 'xprofile_updated_profile', 'bp_xprofile_updated_profile_activity', 10, 5 );
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>