<!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][12542] trunk/src/bp-activity: Activity: fix PHP code standards in inline comments</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 { white-space: pre-line; 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/12542">12542</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/12542","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>imath</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-01-29 19:08:55 +0000 (Wed, 29 Jan 2020)</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: fix PHP code standards in inline comments
Props passoniate
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/8221">#8221</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="#trunksrcbpactivitybpactivityfiltersphp">trunk/src/bp-activity/bp-activity-filters.php</a></li>
<li><a href="#trunksrcbpactivitybpactivityfunctionsphp">trunk/src/bp-activity/bp-activity-functions.php</a></li>
<li><a href="#trunksrcbpactivityclassesclassbpactivitycomponentphp">trunk/src/bp-activity/classes/class-bp-activity-component.php</a></li>
<li><a href="#trunksrcbpactivityclassesclassbpactivitylisttablephp">trunk/src/bp-activity/classes/class-bp-activity-list-table.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 2020-01-29 18:22:45 UTC (rev 12541)
+++ trunk/src/bp-activity/bp-activity-admin.php 2020-01-29 19:08:55 UTC (rev 12542)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -356,7 +356,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> check_admin_referer( 'spam-activity_' . $activity_ids[0] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Initialise counters for how many of each type of item we perform an action on.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Initialize counters for how many of each type of item we perform an action on.
</ins><span class="cx" style="display: block; padding: 0 10px"> $deleted = $spammed = $unspammed = 0;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Store any errors that occurs when updating the database items.
</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 2020-01-29 18:22:45 UTC (rev 12541)
+++ trunk/src/bp-activity/bp-activity-embeds.php 2020-01-29 19:08:55 UTC (rev 12542)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -234,10 +234,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $thumbnail = $oembed->thumbnail_url;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* Non-oEmbed standard attributes */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Mixcloud
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Mixcloud.
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( isset( $oembed->image ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $thumbnail = $oembed->image;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // ReverbNation
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // ReverbNation.
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( isset( $oembed->{'thumbnail-url'} ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $thumbnail = $oembed->{'thumbnail-url'};
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcbpactivitybpactivityfiltersphp"></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-filters.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-activity/bp-activity-filters.php 2020-01-29 18:22:45 UTC (rev 12541)
+++ trunk/src/bp-activity/bp-activity-filters.php 2020-01-29 19:08:55 UTC (rev 12542)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -615,7 +615,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $heartbeat_settings = apply_filters( 'heartbeat_settings', array() );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $heartbeat_settings['interval'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // 'Fast' is 5
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // 'Fast' is 5.
</ins><span class="cx" style="display: block; padding: 0 10px"> $global_pulse = is_numeric( $heartbeat_settings['interval'] ) ? absint( $heartbeat_settings['interval'] ) : 5;
</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 2020-01-29 18:22:45 UTC (rev 12541)
+++ trunk/src/bp-activity/bp-activity-functions.php 2020-01-29 19:08:55 UTC (rev 12542)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -522,12 +522,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type_activity->new_post_type_action_ms = $post_type_object->labels->bp_activity_new_post_ms;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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 the post type supports comments and has a comment action id, build the comments tracking args
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If the post type supports comments and has a comment action id, build the comments tracking args.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $post_type_support_comments && ! empty( $post_type_activity->comment_action_id ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Init a new container for the activity type for comments
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Init a new container for the activity type for comments.
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_type_activity->comments_tracking = new stdClass();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Build the activity type for comments
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Build the activity type for comments.
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_type_activity->comments_tracking->component_id = $post_type_activity->component_id;
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type_activity->comments_tracking->action_id = $post_type_activity->comment_action_id;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1788,7 +1788,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'page' => 1, // Page 1 without a per_page will result in no pagination.
</span><span class="cx" style="display: block; padding: 0 10px"> 'per_page' => false, // Results per page.
</span><span class="cx" style="display: block; padding: 0 10px"> 'show_hidden' => true, // When fetching specific items, show all.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'sort' => 'DESC', // Sort ASC or DESC
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'sort' => 'DESC', // Sort ASC or DESC.
</ins><span class="cx" style="display: block; padding: 0 10px"> 'spam' => 'ham_only', // Retrieve items marked as spam.
</span><span class="cx" style="display: block; padding: 0 10px"> 'update_meta_cache' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> ), 'activity_get_specific' );
</span></span></pre></div>
<a id="trunksrcbpactivityclassesclassbpactivitycomponentphp"></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-component.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-component.php 2020-01-29 18:22:45 UTC (rev 12541)
+++ trunk/src/bp-activity/classes/class-bp-activity-component.php 2020-01-29 19:08:55 UTC (rev 12542)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -71,7 +71,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $includes[] = 'akismet';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Embeds
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Embeds.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( bp_is_active( $this->id, 'embeds' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $includes[] = 'embeds';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcbpactivityclassesclassbpactivitylisttablephp"></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-list-table.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-list-table.php 2020-01-29 18:22:45 UTC (rev 12541)
+++ trunk/src/bp-activity/classes/class-bp-activity-list-table.php 2020-01-29 19:08:55 UTC (rev 12542)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -124,10 +124,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $has_filter_query = apply_filters( 'bp_activity_list_table_filter_activity_type_items', $filter );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $has_filter_query['filter_query'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Reset the filter
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Reset the filter.
</ins><span class="cx" style="display: block; padding: 0 10px"> $filter = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // And use the filter query instead
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // And use the filter query instead.
</ins><span class="cx" style="display: block; padding: 0 10px"> $filter_query = $has_filter_query['filter_query'];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>