<!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][7906] trunk/bp-activity: Whitespace and codestyling in bp-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/7906">7906</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2014-02-17 01:07:32 +0000 (Mon, 17 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Whitespace and codestyling in bp-activity</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivityclassesphp">trunk/bp-activity/bp-activity-classes.php</a></li>
<li><a href="#trunkbpactivitybpactivityfunctionsphp">trunk/bp-activity/bp-activity-functions.php</a></li>
<li><a href="#trunkbpactivitybpactivitytemplatephp">trunk/bp-activity/bp-activity-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivitybpactivityclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-classes.php (7905 => 7906)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-classes.php 2014-02-17 01:02:25 UTC (rev 7905)
+++ trunk/bp-activity/bp-activity-classes.php 2014-02-17 01:07:32 UTC (rev 7906)
</span><span class="lines">@@ -281,18 +281,19 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $defaults = array(
</span><del>- 'page' => 1, // The current page
- 'per_page' => 25, // Activity items per page
- 'max' => false, // Max number of items to return
- 'sort' => 'DESC', // ASC or DESC
- 'exclude' => false, // Array of ids to exclude
- 'in' => false, // Array of ids to limit query by (IN)
- 'meta_query' => false, // Filter by activitymeta
- 'filter' => false, // See self::get_filter_sql()
- 'search_terms' => false, // Terms to search by
- 'display_comments' => false, // Whether to include activity comments
- 'show_hidden' => false, // Show items marked hide_sitewide
- 'spam' => 'ham_only', // Spam status
</del><ins>+ 'page' => 1, // The current page
+ 'per_page' => 25, // Activity items per page
+ 'max' => false, // Max number of items to return
+ 'sort' => 'DESC', // ASC or DESC
+ 'exclude' => false, // Array of ids to exclude
+ 'in' => false, // Array of ids to limit query by (IN)
+ 'meta_query' => false, // Filter by activitymeta
+ 'filter' => false, // See self::get_filter_sql()
+ 'search_terms' => false, // Terms to search by
+ 'display_comments' => false, // Whether to include activity comments
+ 'show_hidden' => false, // Show items marked hide_sitewide
+ 'spam' => 'ham_only', // Spam status
+ 'update_meta_cache' => true,
</ins><span class="cx"> );
</span><span class="cx"> $r = wp_parse_args( $args, $defaults );
</span><span class="cx"> extract( $r );
</span></span></pre></div>
<a id="trunkbpactivitybpactivityfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-functions.php (7905 => 7906)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-functions.php 2014-02-17 01:02:25 UTC (rev 7905)
+++ trunk/bp-activity/bp-activity-functions.php 2014-02-17 01:07:32 UTC (rev 7906)
</span><span class="lines">@@ -898,18 +898,18 @@
</span><span class="cx"> */
</span><span class="cx"> function bp_activity_get( $args = '' ) {
</span><span class="cx"> $defaults = array(
</span><del>- 'max' => false, // Maximum number of results to return
- 'page' => 1, // page 1 without a per_page will result in no pagination.
- 'per_page' => false, // results per page
- 'sort' => 'DESC', // sort ASC or DESC
- 'display_comments' => false, // false for no comments. 'stream' for within stream display, 'threaded' for below each activity item
</del><ins>+ 'max' => false, // Maximum number of results to return
+ 'page' => 1, // page 1 without a per_page will result in no pagination.
+ 'per_page' => false, // results per page
+ 'sort' => 'DESC', // sort ASC or DESC
+ 'display_comments' => false, // false for no comments. 'stream' for within stream display, 'threaded' for below each activity item
</ins><span class="cx">
</span><del>- 'search_terms' => false, // Pass search terms as a string
- 'meta_query' => false, // Filter by activity meta. See WP_Meta_Query for format
- 'show_hidden' => false, // Show activity items that are hidden site-wide?
- 'exclude' => false, // Comma-separated list of activity IDs to exclude
- 'in' => false, // Comma-separated list or array of activity IDs to which you want to limit the query
- 'spam' => 'ham_only', // 'ham_only' (default), 'spam_only' or 'all'.
</del><ins>+ 'search_terms' => false, // Pass search terms as a string
+ 'meta_query' => false, // Filter by activity meta. See WP_Meta_Query for format
+ 'show_hidden' => false, // Show activity items that are hidden site-wide?
+ 'exclude' => false, // Comma-separated list of activity IDs to exclude
+ 'in' => false, // Comma-separated list or array of activity IDs to which you want to limit the query
+ 'spam' => 'ham_only', // 'ham_only' (default), 'spam_only' or 'all'.
</ins><span class="cx"> 'update_meta_cache' => true,
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -931,16 +931,16 @@
</span><span class="cx"> if ( 1 == (int) $page && empty( $max ) && empty( $search_terms ) && empty( $meta_query ) && empty( $filter ) && empty( $exclude ) && empty( $in ) && 'DESC' == $sort && empty( $exclude ) && 'ham_only' == $spam ) {
</span><span class="cx"> if ( !$activity = wp_cache_get( 'bp_activity_sitewide_front', 'bp' ) ) {
</span><span class="cx"> $args = array(
</span><del>- 'page' => $page,
- 'per_page' => $per_page,
- 'max' => $max,
- 'sort' => $sort,
- 'search_terms' => $search_terms,
- 'meta_query' => $meta_query,
- 'filter' => $filter,
- 'display_comments' => $display_comments,
- 'show_hidden' => $show_hidden,
- 'spam' => $spam,
</del><ins>+ 'page' => $page,
+ 'per_page' => $per_page,
+ 'max' => $max,
+ 'sort' => $sort,
+ 'search_terms' => $search_terms,
+ 'meta_query' => $meta_query,
+ 'filter' => $filter,
+ 'display_comments' => $display_comments,
+ 'show_hidden' => $show_hidden,
+ 'spam' => $spam,
</ins><span class="cx"> 'update_meta_cache' => $update_meta_cache,
</span><span class="cx"> );
</span><span class="cx"> $activity = BP_Activity_Activity::get( $args );
</span><span class="lines">@@ -988,28 +988,28 @@
</span><span class="cx"> */
</span><span class="cx"> function bp_activity_get_specific( $args = '' ) {
</span><span class="cx"> $defaults = array(
</span><del>- 'activity_ids' => false, // A single activity_id or array of IDs.
- 'display_comments' => false, // true or false to display threaded comments for these specific activity items
- 'max' => false, // Maximum number of results to return
- 'page' => 1, // page 1 without a per_page will result in no pagination.
- 'per_page' => false, // results per page
- 'show_hidden' => true, // When fetching specific items, show all
- 'sort' => 'DESC', // sort ASC or DESC
- 'spam' => 'ham_only', // Retrieve items marked as spam
</del><ins>+ 'activity_ids' => false, // A single activity_id or array of IDs.
+ 'display_comments' => false, // true or false to display threaded comments for these specific activity items
+ 'max' => false, // Maximum number of results to return
+ 'page' => 1, // page 1 without a per_page will result in no pagination.
+ 'per_page' => false, // results per page
+ 'show_hidden' => true, // When fetching specific items, show all
+ 'sort' => 'DESC', // sort ASC or DESC
+ 'spam' => 'ham_only', // Retrieve items marked as spam
</ins><span class="cx"> 'update_meta_cache' => true,
</span><span class="cx"> );
</span><span class="cx"> $r = wp_parse_args( $args, $defaults );
</span><span class="cx"> extract( $r, EXTR_SKIP );
</span><span class="cx">
</span><span class="cx"> $get_args = array(
</span><del>- 'page' => $page,
- 'per_page' => $per_page,
- 'max' => $max,
- 'sort' => $sort,
- 'display_comments' => $display_comments,
- 'show_hidden' => $show_hidden,
- 'in' => $activity_ids,
- 'spam' => $spam,
</del><ins>+ 'page' => $page,
+ 'per_page' => $per_page,
+ 'max' => $max,
+ 'sort' => $sort,
+ 'display_comments' => $display_comments,
+ 'show_hidden' => $show_hidden,
+ 'in' => $activity_ids,
+ 'spam' => $spam,
</ins><span class="cx"> 'update_meta_cache' => $update_meta_cache,
</span><span class="cx"> );
</span><span class="cx"> return apply_filters( 'bp_activity_get_specific', BP_Activity_Activity::get( $get_args ), $args, $get_args );
</span></span></pre></div>
<a id="trunkbpactivitybpactivitytemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-template.php (7905 => 7906)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-template.php 2014-02-17 01:02:25 UTC (rev 7905)
+++ trunk/bp-activity/bp-activity-template.php 2014-02-17 01:07:32 UTC (rev 7906)
</span><span class="lines">@@ -159,20 +159,20 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $defaults = array(
</span><del>- 'page' => 1,
- 'per_page' => 20,
- 'page_arg' => 'acpage',
- 'max' => false,
- 'sort' => false,
- 'include' => false,
- 'exclude' => false,
- 'in' => false,
- 'filter' => false,
- 'search_terms' => false,
- 'meta_query' => false,
- 'display_comments' => 'threaded',
- 'show_hidden' => false,
- 'spam' => 'ham_only',
</del><ins>+ 'page' => 1,
+ 'per_page' => 20,
+ 'page_arg' => 'acpage',
+ 'max' => false,
+ 'sort' => false,
+ 'include' => false,
+ 'exclude' => false,
+ 'in' => false,
+ 'filter' => false,
+ 'search_terms' => false,
+ 'meta_query' => false,
+ 'display_comments' => 'threaded',
+ 'show_hidden' => false,
+ 'spam' => 'ham_only',
</ins><span class="cx"> 'update_meta_cache' => true,
</span><span class="cx"> );
</span><span class="cx"> $r = wp_parse_args( $args, $defaults );
</span><span class="lines">@@ -188,12 +188,37 @@
</span><span class="cx"> $this->my_favs = maybe_unserialize( bp_get_user_meta( bp_loggedin_user_id(), 'bp_favorite_activities', true ) );
</span><span class="cx">
</span><span class="cx"> // Fetch specific activity items based on ID's
</span><del>- if ( !empty( $include ) )
- $this->activities = bp_activity_get_specific( array( 'activity_ids' => explode( ',', $include ), 'max' => $max, 'page' => $this->pag_page, 'per_page' => $this->pag_num, 'sort' => $sort, 'display_comments' => $display_comments, 'show_hidden' => $show_hidden, 'spam' => $spam, 'update_meta_cache' => $update_meta_cache, ) );
</del><ins>+ if ( !empty( $include ) ) {
+ $this->activities = bp_activity_get_specific( array(
+ 'activity_ids' => explode( ',', $include ),
+ 'max' => $max,
+ 'page' => $this->pag_page,
+ 'per_page' => $this->pag_num,
+ 'sort' => $sort,
+ 'display_comments' => $display_comments,
+ 'show_hidden' => $show_hidden,
+ 'spam' => $spam,
+ 'update_meta_cache' => $update_meta_cache,
+ ) );
</ins><span class="cx">
</span><span class="cx"> // Fetch all activity items
</span><del>- else
- $this->activities = bp_activity_get( array( 'display_comments' => $display_comments, 'max' => $max, 'per_page' => $this->pag_num, 'page' => $this->pag_page, 'sort' => $sort, 'search_terms' => $search_terms, 'meta_query' => $meta_query, 'filter' => $filter, 'show_hidden' => $show_hidden, 'exclude' => $exclude, 'in' => $in, 'spam' => $spam, 'update_meta_cache' => $update_meta_cache, ) );
</del><ins>+ } else {
+ $this->activities = bp_activity_get( array(
+ 'display_comments' => $display_comments,
+ 'max' => $max,
+ 'per_page' => $this->pag_num,
+ 'page' => $this->pag_page,
+ 'sort' => $sort,
+ 'search_terms' => $search_terms,
+ 'meta_query' => $meta_query,
+ 'filter' => $filter,
+ 'show_hidden' => $show_hidden,
+ 'exclude' => $exclude,
+ 'in' => $in,
+ 'spam' => $spam,
+ 'update_meta_cache' => $update_meta_cache,
+ ) );
+ }
</ins><span class="cx">
</span><span class="cx"> if ( !$max || $max >= (int) $this->activities['total'] )
</span><span class="cx"> $this->total_activity_count = (int) $this->activities['total'];
</span><span class="lines">@@ -496,33 +521,33 @@
</span><span class="cx">
</span><span class="cx"> // Note: any params used for filtering can be a single value, or multiple values comma separated.
</span><span class="cx"> $defaults = array(
</span><del>- 'display_comments' => 'threaded', // false for none, stream/threaded - show comments in the stream or threaded under items
- 'include' => $include, // pass an activity_id or string of IDs comma-separated
- 'exclude' => $exclude, // pass an activity_id or string of IDs comma-separated
- 'in' => $in, // comma-separated list or array of activity IDs among which to search
- 'sort' => 'DESC', // sort DESC or ASC
- 'page' => 1, // which page to load
- 'per_page' => 20, // number of items per page
- 'max' => false, // max number to return
- 'show_hidden' => $show_hidden, // Show activity items that are hidden site-wide?
- 'spam' => 'ham_only', // Hide spammed items
</del><ins>+ 'display_comments' => 'threaded', // false for none, stream/threaded - show comments in the stream or threaded under items
+ 'include' => $include, // pass an activity_id or string of IDs comma-separated
+ 'exclude' => $exclude, // pass an activity_id or string of IDs comma-separated
+ 'in' => $in, // comma-separated list or array of activity IDs among which to search
+ 'sort' => 'DESC', // sort DESC or ASC
+ 'page' => 1, // which page to load
+ 'per_page' => 20, // number of items per page
+ 'max' => false, // max number to return
+ 'show_hidden' => $show_hidden, // Show activity items that are hidden site-wide?
+ 'spam' => 'ham_only', // Hide spammed items
</ins><span class="cx">
</span><del>- 'page_arg' => 'acpage', // See https://buddypress.trac.wordpress.org/ticket/3679
</del><ins>+ 'page_arg' => 'acpage', // See https://buddypress.trac.wordpress.org/ticket/3679
</ins><span class="cx">
</span><span class="cx"> // Scope - pre-built activity filters for a user (friends/groups/favorites/mentions)
</span><del>- 'scope' => $scope,
</del><ins>+ 'scope' => $scope,
</ins><span class="cx">
</span><span class="cx"> // Filtering
</span><del>- 'user_id' => $user_id, // user_id to filter on
- 'object' => $object, // object to filter on e.g. groups, profile, status, friends
- 'action' => false, // action to filter on e.g. activity_update, new_forum_post, profile_updated
- 'primary_id' => $primary_id, // object ID to filter on e.g. a group_id or forum_id or blog_id etc.
- 'secondary_id' => false, // secondary object ID to filter on e.g. a post_id
</del><ins>+ 'user_id' => $user_id, // user_id to filter on
+ 'object' => $object, // object to filter on e.g. groups, profile, status, friends
+ 'action' => false, // action to filter on e.g. activity_update, new_forum_post, profile_updated
+ 'primary_id' => $primary_id, // object ID to filter on e.g. a group_id or forum_id or blog_id etc.
+ 'secondary_id' => false, // secondary object ID to filter on e.g. a post_id
</ins><span class="cx">
</span><del>- 'meta_query' => false, // filter on activity meta. See WP_Meta_Query for format
</del><ins>+ 'meta_query' => false, // filter on activity meta. See WP_Meta_Query for format
</ins><span class="cx">
</span><span class="cx"> // Searching
</span><del>- 'search_terms' => false, // specify terms to search on
</del><ins>+ 'search_terms' => false, // specify terms to search on
</ins><span class="cx"> 'update_meta_cache' => true,
</span><span class="cx"> );
</span><span class="cx">
</span><span class="lines">@@ -617,20 +642,20 @@
</span><span class="cx"> $spam = 'all';
</span><span class="cx">
</span><span class="cx"> $template_args = array(
</span><del>- 'page' => $page,
- 'per_page' => $per_page,
- 'page_arg' => $page_arg,
- 'max' => $max,
- 'sort' => $sort,
- 'include' => $include,
- 'exclude' => $exclude,
- 'in' => $in,
- 'filter' => $filter,
- 'search_terms' => $search_terms,
- 'meta_query' => $meta_query,
- 'display_comments' => $display_comments,
- 'show_hidden' => $show_hidden,
- 'spam' => $spam,
</del><ins>+ 'page' => $page,
+ 'per_page' => $per_page,
+ 'page_arg' => $page_arg,
+ 'max' => $max,
+ 'sort' => $sort,
+ 'include' => $include,
+ 'exclude' => $exclude,
+ 'in' => $in,
+ 'filter' => $filter,
+ 'search_terms' => $search_terms,
+ 'meta_query' => $meta_query,
+ 'display_comments' => $display_comments,
+ 'show_hidden' => $show_hidden,
+ 'spam' => $spam,
</ins><span class="cx"> 'update_meta_cache' => $update_meta_cache,
</span><span class="cx"> );
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>