<!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][10375] trunk/src/bp-activity: Misc docs fixes that were missed or added.</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/10375">10375</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/10375","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>tw2113</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-11-23 05:51:55 +0000 (Mon, 23 Nov 2015)</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'>Misc docs fixes that were missed or added.
See <a href="http://buddypress.trac.wordpress.org/ticket/6396">#6396</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpactivitybpactivityactionsphp">trunk/src/bp-activity/bp-activity-actions.php</a></li>
<li><a href="#trunksrcbpactivitybpactivityadminphp">trunk/src/bp-activity/bp-activity-admin.php</a></li>
<li><a href="#trunksrcbpactivitybpactivityakismetphp">trunk/src/bp-activity/bp-activity-akismet.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="#trunksrcbpactivityclassesclassbpactivityactivityphp">trunk/src/bp-activity/classes/class-bp-activity-activity.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpactivitybpactivityactionsphp"></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-actions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-activity/bp-activity-actions.php 2015-11-23 03:55:00 UTC (rev 10374)
+++ trunk/src/bp-activity/bp-activity-actions.php 2015-11-23 05:51:55 UTC (rev 10375)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -105,7 +105,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.2.2
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param array Array with url to redirect to and activity related to the redirect.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $value Array with url to redirect to and activity related to the redirect.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $redirect = apply_filters_ref_array( 'bp_activity_permalink_redirect_url', array( $redirect, &$activity ) ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> bp_core_redirect( bp_get_root_domain() );
</span></span></pre></div>
<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 2015-11-23 03:55:00 UTC (rev 10374)
+++ trunk/src/bp-activity/bp-activity-admin.php 2015-11-23 05:51:55 UTC (rev 10375)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -360,9 +360,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // "We'd like to shoot the monster, could you move, please?"
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $activity_ids as $activity_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // @todo: Check the permissions on each
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- //if ( ! current_user_can( 'bp_edit_activity', $activity_id ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // if ( ! current_user_can( 'bp_edit_activity', $activity_id ) )
</ins><span class="cx" style="display: block; padding: 0 10px"> // continue;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> // Get the activity from the database.
</span><span class="cx" style="display: block; padding: 0 10px"> $activity = new BP_Activity_Activity( $activity_id );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $activity->component ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -565,7 +564,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.6.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param array Array holding activity object and ID that holds error.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $value Array holding activity object and ID that holds error.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action_ref_array( 'bp_activity_admin_edit_after', array( &$activity, $error ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1650,7 +1649,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="response-links">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Activity permalink
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Activity permalink.
</ins><span class="cx" style="display: block; padding: 0 10px"> $activity_permalink = '';
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $item['is_spam'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $activity_permalink = '<a href="' . bp_activity_get_permalink( $item['id'], (object) $item ) . '" class="comments-view-item-link">' . __( 'View Activity', 'buddypress' ) . '</a>';
</span></span></pre></div>
<a id="trunksrcbpactivitybpactivityakismetphp"></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-akismet.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-activity/bp-activity-akismet.php 2015-11-23 03:55:00 UTC (rev 10374)
+++ trunk/src/bp-activity/bp-activity-akismet.php 2015-11-23 05:51:55 UTC (rev 10375)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -254,7 +254,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.6.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param array Array of default activity types for Akismet to check.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $value Array of default activity types for Akismet to check.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> return apply_filters( 'bp_akismet_get_activity_types', array( 'activity_comment', 'activity_update' ) );
</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 2015-11-23 03:55:00 UTC (rev 10374)
+++ trunk/src/bp-activity/bp-activity-filters.php 2015-11-23 05:51:55 UTC (rev 10375)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,7 +9,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Exit if accessed directly.
</span><span class="cx" style="display: block; padding: 0 10px"> defined( 'ABSPATH' ) || exit;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/** Filters *******************************************************************/
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/* Filters *******************************************************************/
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Apply WordPress defined filters.
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'bp_get_activity_action', 'bp_activity_filter_kses', 1 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -98,7 +98,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'bp_get_total_favorite_count_for_user', 'bp_core_number_format' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'bp_get_total_mention_count_for_user', 'bp_core_number_format' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/** Actions *******************************************************************/
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/* Actions *******************************************************************/
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // At-name filter.
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'bp_activity_before_save', 'bp_activity_at_name_filter_updates' );
</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 2015-11-23 03:55:00 UTC (rev 10374)
+++ trunk/src/bp-activity/bp-activity-functions.php 2015-11-23 05:51:55 UTC (rev 10375)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1426,16 +1426,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function bp_activity_get( $args = '' ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $r = bp_parse_args( $args, array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'max' => false, // Maximum number of results to return
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'max' => false, // Maximum number of results to return.
</ins><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'all',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'page' => 1, // page 1 without a per_page will result in no pagination.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'page' => 1, // Page 1 without a per_page will result in no pagination.
</ins><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"> 'sort' => 'DESC', // sort ASC or DESC
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'display_comments' => false, // false for no comments. 'stream' for within stream display, 'threaded' for below each activity item
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'display_comments' => false, // False for no comments. 'stream' for within stream display, 'threaded' for below each activity item.
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> 'search_terms' => false, // Pass search terms as a string
</span><span class="cx" style="display: block; padding: 0 10px"> 'meta_query' => false, // Filter by activity meta. See WP_Meta_Query for format
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'date_query' => false, // Filter by date. See first parameter of WP_Date_Query for format
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'date_query' => false, // Filter by date. See first parameter of WP_Date_Query for format.
</ins><span class="cx" style="display: block; padding: 0 10px"> 'filter_query' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'show_hidden' => false, // Show activity items that are hidden site-wide?
</span><span class="cx" style="display: block; padding: 0 10px"> 'exclude' => false, // Comma-separated list of activity IDs to exclude.
</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 2015-11-23 03:55:00 UTC (rev 10374)
+++ trunk/src/bp-activity/classes/class-bp-activity-activity.php 2015-11-23 05:51:55 UTC (rev 10375)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -479,7 +479,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.6.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param array Array of indexes in preferred order.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $value Array of indexes in preferred order.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $indexes = apply_filters( 'bp_activity_preferred_index_order', array( 'user_id', 'item_id', 'secondary_item_id', 'date_recorded', 'component', 'type', 'hide_sitewide', 'is_spam' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>