<!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][10853] trunk/src: Activity: Cast activity properties as integers where appropriate.</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/10853">10853</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/10853","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>r-a-y</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-06-01 16:59:31 +0000 (Wed, 01 Jun 2016)</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'>Activity: Cast activity properties as integers where appropriate.
Props DJPaul, r-a-y.
See <a href="http://buddypress.trac.wordpress.org/ticket/6977">#6977</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpactivitybpactivityadminphp">trunk/src/bp-activity/bp-activity-admin.php</a></li>
<li><a href="#trunksrcbpactivitybpactivityembedsphp">trunk/src/bp-activity/bp-activity-embeds.php</a></li>
<li><a href="#trunksrcbpactivitybpactivityfunctionsphp">trunk/src/bp-activity/bp-activity-functions.php</a></li>
<li><a href="#trunksrcbpactivitybpactivityscreensphp">trunk/src/bp-activity/bp-activity-screens.php</a></li>
<li><a href="#trunksrcbpactivitybpactivitytemplatephp">trunk/src/bp-activity/bp-activity-template.php</a></li>
<li><a href="#trunksrcbpactivityclassesclassbpactivityactivityphp">trunk/src/bp-activity/classes/class-bp-activity-activity.php</a></li>
<li><a href="#trunksrcbpblogsbpblogsactivityphp">trunk/src/bp-blogs/bp-blogs-activity.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpactivitybpactivityadminphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-activity/bp-activity-admin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-activity/bp-activity-admin.php 2016-06-01 16:34:39 UTC (rev 10852)
+++ trunk/src/bp-activity/bp-activity-admin.php 2016-06-01 16:59:31 UTC (rev 10853)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -579,9 +579,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If an error occurred, pass back the activity ID that failed.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $error )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $redirect_to = add_query_arg( 'error', (int) $error, $redirect_to );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $redirect_to = add_query_arg( 'error', $error, $redirect_to );
</ins><span class="cx" style="display: block; padding: 0 10px"> else
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $redirect_to = add_query_arg( 'updated', (int) $activity->id, $redirect_to );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $redirect_to = add_query_arg( 'updated', $activity->id, $redirect_to );
</ins><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"> * Filters URL to redirect to after saving.
</span></span></pre></div>
<a id="trunksrcbpactivitybpactivityembedsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-activity/bp-activity-embeds.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-activity/bp-activity-embeds.php 2016-06-01 16:34:39 UTC (rev 10852)
+++ trunk/src/bp-activity/bp-activity-embeds.php 2016-06-01 16:59:31 UTC (rev 10853)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -103,7 +103,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $activity = reset( $activity );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // No need to requery if we already got the embed activity
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( (int) $activity_id === (int) $activity->id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( (int) $activity_id === $activity->id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $activities_template->has_activities();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcbpactivitybpactivityfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-activity/bp-activity-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-activity/bp-activity-functions.php 2016-06-01 16:34:39 UTC (rev 10852)
+++ trunk/src/bp-activity/bp-activity-functions.php 2016-06-01 16:59:31 UTC (rev 10853)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -169,7 +169,7 @@
</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"> // Get activity object.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $activity = new BP_Activity_Activity( (int) $activity_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $activity = new BP_Activity_Activity( $activity_id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Try to find mentions.
</span><span class="cx" style="display: block; padding: 0 10px"> $usernames = bp_activity_find_mentions( strip_tags( $activity->content ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2556,7 +2556,7 @@
</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"> // Check to see if the parent activity is hidden, and if so, hide this comment publicly.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $is_hidden = ( (int) $activity->hide_sitewide ) ? 1 : 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $is_hidden = $activity->hide_sitewide ? 1 : 0;
</ins><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"> * Filters the content of a new comment.
</span></span></pre></div>
<a id="trunksrcbpactivitybpactivityscreensphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-activity/bp-activity-screens.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-activity/bp-activity-screens.php 2016-06-01 16:34:39 UTC (rev 10852)
+++ trunk/src/bp-activity/bp-activity-screens.php 2016-06-01 16:59:31 UTC (rev 10853)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -281,7 +281,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $url = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> site_url( 'wp-login.php?redirect_to=%s' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- urlencode( esc_url_raw( bp_activity_get_permalink( (int) bp_current_action() ) ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ urlencode( esc_url_raw( bp_activity_get_permalink( bp_current_action() ) ) )
</ins><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></span></pre></div>
<a id="trunksrcbpactivitybpactivitytemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-activity/bp-activity-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-activity/bp-activity-template.php 2016-06-01 16:34:39 UTC (rev 10852)
+++ trunk/src/bp-activity/bp-activity-template.php 2016-06-01 16:59:31 UTC (rev 10853)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1563,7 +1563,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Users are allowed to delete their own activity. This is actually
</span><span class="cx" style="display: block; padding: 0 10px"> // quite powerful, because doing so also deletes all comments to that
</span><span class="cx" style="display: block; padding: 0 10px"> // activity item. We should revisit this eventually.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $activity->user_id ) && ( (int) $activity->user_id === bp_loggedin_user_id() ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $activity->user_id ) && ( $activity->user_id === bp_loggedin_user_id() ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $can_delete = true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1616,7 +1616,7 @@
</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"> // Get the ID of the parent activity content.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $parent_id = (int) $activities_template->activity->item_id;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parent_id = $activities_template->activity->item_id;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Bail if no parent content.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $activities_template->activity_parents[ $parent_id ] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1680,7 +1680,7 @@
</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"> // Get the ID of the parent activity content.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $parent_id = (int) $activities_template->activity->item_id;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parent_id = $activities_template->activity->item_id;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Bail if no parent item.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $activities_template->activity_parents[ $parent_id ] ) ) {
</span></span></pre></div>
<a id="trunksrcbpactivityclassesclassbpactivityactivityphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-activity/classes/class-bp-activity-activity.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-activity/classes/class-bp-activity-activity.php 2016-06-01 16:34:39 UTC (rev 10852)
+++ trunk/src/bp-activity/classes/class-bp-activity-activity.php 2016-06-01 16:59:31 UTC (rev 10853)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -107,7 +107,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.1.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @var int
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var $hide_sitewide = false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var $hide_sitewide = 0;
</ins><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"> * Node boundary start for activity or activity comment.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -142,7 +142,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function __construct( $id = false ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !empty( $id ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->id = $id;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->id = (int) $id;
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->populate();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -175,10 +175,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->action = $row->action;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->content = $row->content;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->date_recorded = $row->date_recorded;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->hide_sitewide = $row->hide_sitewide;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->hide_sitewide = (int) $row->hide_sitewide;
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->mptt_left = (int) $row->mptt_left;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->mptt_right = (int) $row->mptt_right;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->is_spam = $row->is_spam;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->is_spam = (int) $row->is_spam;
</ins><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"> // Generate dynamic 'action' when possible.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -708,7 +708,20 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Now fetch data from the cache.
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $activity_ids as $activity_id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $activities[] = wp_cache_get( $activity_id, 'bp_activity' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Integer casting.
+ $activity = wp_cache_get( $activity_id, 'bp_activity' );
+ if ( ! empty( $activity ) ) {
+ $activity->id = (int) $activity->id;
+ $activity->user_id = (int) $activity->user_id;
+ $activity->item_id = (int) $activity->item_id;
+ $activity->secondary_item_id = (int) $activity->secondary_item_id;
+ $activity->hide_sitewide = (int) $activity->hide_sitewide;
+ $activity->mptt_left = (int) $activity->mptt_left;
+ $activity->mptt_right = (int) $activity->mptt_right;
+ $activity->is_spam = (int) $activity->is_spam;
+ }
+
+ $activities[] = $activity;
</ins><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"> // Then fetch user data.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1071,7 +1084,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $where_args ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $where_sql = 'WHERE ' . join( ' AND ', $where_args );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return $wpdb->get_var( "SELECT id FROM {$bp->activity->table_name} {$where_sql}" );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $result = $wpdb->get_var( "SELECT id FROM {$bp->activity->table_name} {$where_sql}" );
+
+ return is_numeric( $result ) ? (int) $result : false;
</ins><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"> return false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1763,7 +1778,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $bp = buddypress();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return $wpdb->get_var( $wpdb->prepare( "SELECT id FROM {$bp->activity->table_name} WHERE content = %s", $content ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $result = $wpdb->get_var( $wpdb->prepare( "SELECT id FROM {$bp->activity->table_name} WHERE content = %s", $content ) );
+
+ return is_numeric( $result ) ? (int) $result : false;
</ins><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></span></pre></div>
<a id="trunksrcbpblogsbpblogsactivityphp"></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-activity.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-blogs/bp-blogs-activity.php 2016-06-01 16:34:39 UTC (rev 10852)
+++ trunk/src/bp-blogs/bp-blogs-activity.php 2016-06-01 16:59:31 UTC (rev 10853)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -948,7 +948,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> remove_action( 'transition_comment_status', 'bp_activity_transition_post_type_comment_status', 10, 3 );
</span><span class="cx" style="display: block; padding: 0 10px"> remove_action( 'bp_activity_post_type_comment', 'bp_blogs_comment_sync_activity_comment', 10, 4 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 1 === (int) $activity->is_spam && 'spam' !== $post_comment_status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 1 === $activity->is_spam && 'spam' !== $post_comment_status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_spam_comment( $post_comment_id );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! $activity->is_spam ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'spam' === $post_comment_status ) {
</span></span></pre>
</div>
</div>
</body>
</html>