<!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][11580] trunk/src/bp-activity/classes/class-bp-activity-activity.php: Adds support for customizing the orderby parameer for BP_Activity_Acitivty::get() method.</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/11580">11580</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/11580","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>2017-06-07 02:01:53 +0000 (Wed, 07 Jun 2017)</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'>Adds support for customizing the orderby parameer for BP_Activity_Acitivty::get() method.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/7205">#7205</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<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="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 2017-06-06 19:12:23 UTC (rev 11579)
+++ trunk/src/bp-activity/classes/class-bp-activity-activity.php 2017-06-07 02:01:53 UTC (rev 11580)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -320,6 +320,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.2.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.4.0 Introduced the `$fields` parameter.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 2.9.0 Introduced the `$order_by` parameter.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see BP_Activity_Activity::get_filter_sql() for a description of the
</span><span class="cx" style="display: block; padding: 0 10px"> * 'filter' parameter.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -335,6 +336,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $fields Activity fields to return. Pass 'ids' to get only the activity IDs.
</span><span class="cx" style="display: block; padding: 0 10px"> * 'all' returns full activity objects.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $sort ASC or DESC. Default: 'DESC'.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @type string $order_by Column to order results by.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @type array $exclude Array of activity IDs to exclude. Default: false.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type array $in Array of ids to limit query by (IN). Default: false.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type array $meta_query Array of meta_query conditions. See WP_Meta_Query::queries.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -381,24 +383,25 @@
</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"> $r = wp_parse_args( $args, array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'page' => 1, // The current page.
- 'per_page' => 25, // Activity items per page.
- 'max' => false, // Max number of items to return.
- 'fields' => 'all', // Fields to include.
- '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.
- 'date_query' => false, // Filter by date.
- 'filter_query' => false, // Advanced filtering - see BP_Activity_Query.
- 'filter' => false, // See self::get_filter_sql().
- 'scope' => false, // Preset activity arguments.
- '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, // Whether or not to update meta cache.
- 'count_total' => false, // Whether or not to use count_total.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'page' => 1, // The current page.
+ 'per_page' => 25, // Activity items per page.
+ 'max' => false, // Max number of items to return.
+ 'fields' => 'all', // Fields to include.
+ 'sort' => 'DESC', // ASC or DESC.
+ 'order_by' => 'date_recorded', // Column to order by.
+ 'exclude' => false, // Array of ids to exclude.
+ 'in' => false, // Array of ids to limit query by (IN).
+ 'meta_query' => false, // Filter by activitymeta.
+ 'date_query' => false, // Filter by date.
+ 'filter_query' => false, // Advanced filtering - see BP_Activity_Query.
+ 'filter' => false, // See self::get_filter_sql().
+ 'scope' => false, // Preset activity arguments.
+ '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, // Whether or not to update meta cache.
+ 'count_total' => false, // Whether or not to use count_total.
</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"> // Select conditions.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -461,6 +464,29 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $sort = 'DESC';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ switch( $r['order_by'] ) {
+ case 'id' :
+ case 'user_id' :
+ case 'component' :
+ case 'type' :
+ case 'action' :
+ case 'content' :
+ case 'primary_link' :
+ case 'item_id' :
+ case 'secondary_item_id' :
+ case 'date_recorded' :
+ case 'hide_sitewide' :
+ case 'mptt_left' :
+ case 'mptt_right' :
+ case 'is_spam' :
+ break;
+
+ default :
+ $r['order_by'] = 'date_recorded';
+ break;
+ }
+ $order_by = 'a.' . $r['order_by'];
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Hide Hidden Items?
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $r['show_hidden'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $where_conditions['hidden_sql'] = "a.hide_sitewide = 0";
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -607,7 +633,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> // Query first for activity IDs.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $activity_ids_sql = "{$select_sql} {$from_sql} {$join_sql} {$where_sql} ORDER BY a.date_recorded {$sort}, a.id {$sort}";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $activity_ids_sql = "{$select_sql} {$from_sql} {$join_sql} {$where_sql} ORDER BY {$order_by} {$sort}, a.id {$sort}";
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $per_page ) && ! empty( $page ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // We query for $per_page + 1 items in order to
</span></span></pre>
</div>
</div>
</body>
</html>