<!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][10767] trunk/src/bp-groups: Normalize documentation and array definition whitespace after [10766].</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/10767">10767</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/10767","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>boonebgorges</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-05-15 02:30:51 +0000 (Sun, 15 May 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'>Normalize documentation and array definition whitespace after <a href="http://buddypress.trac.wordpress.org/changeset/10766">[10766]</a>.
See <a href="http://buddypress.trac.wordpress.org/ticket/6784">#6784</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpgroupsbpgroupsfunctionsphp">trunk/src/bp-groups/bp-groups-functions.php</a></li>
<li><a href="#trunksrcbpgroupsbpgroupstemplatephp">trunk/src/bp-groups/bp-groups-template.php</a></li>
<li><a href="#trunksrcbpgroupsclassesclassbpgroupsgroupphp">trunk/src/bp-groups/classes/class-bp-groups-group.php</a></li>
<li><a href="#trunksrcbpgroupsclassesclassbpgroupstemplatephp">trunk/src/bp-groups/classes/class-bp-groups-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpgroupsbpgroupsfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-groups/bp-groups-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-groups/bp-groups-functions.php 2016-05-15 02:21:54 UTC (rev 10766)
+++ trunk/src/bp-groups/bp-groups-functions.php 2016-05-15 02:30:51 UTC (rev 10767)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -697,43 +697,43 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function groups_get_groups( $args = '' ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $defaults = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'type' => false, // Active, newest, alphabetical, random, popular, most-forum-topics or most-forum-posts.
- 'order' => 'DESC', // 'ASC' or 'DESC'
- 'orderby' => 'date_created', // date_created, last_activity, total_member_count, name, random.
- 'user_id' => false, // Pass a user_id to limit to only groups that this user is a member of.
- 'include' => false, // Only include these specific groups (group_ids).
- 'exclude' => false, // Do not include these specific groups (group_ids).
- 'search_terms' => false, // Limit to groups that match these search terms.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'type' => false, // Active, newest, alphabetical, random, popular, most-forum-topics or most-forum-posts.
+ 'order' => 'DESC', // 'ASC' or 'DESC'
+ 'orderby' => 'date_created', // date_created, last_activity, total_member_count, name, random.
+ 'user_id' => false, // Pass a user_id to limit to only groups that this user is a member of.
+ 'include' => false, // Only include these specific groups (group_ids).
+ 'exclude' => false, // Do not include these specific groups (group_ids).
+ 'search_terms' => false, // Limit to groups that match these search terms.
</ins><span class="cx" style="display: block; padding: 0 10px"> 'group_type' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'group_type__in' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'group_type__not_in' => '',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'meta_query' => false, // Filter by groupmeta. See WP_Meta_Query for syntax.
- 'show_hidden' => false, // Show hidden groups to non-admins.
- 'per_page' => 20, // The number of results to return per page.
- 'page' => 1, // The page to return if limiting per page.
- 'populate_extras' => true, // Fetch meta such as is_banned and is_member.
- 'update_meta_cache' => true, // Pre-fetch groupmeta for queried groups.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'meta_query' => false, // Filter by groupmeta. See WP_Meta_Query for syntax.
+ 'show_hidden' => false, // Show hidden groups to non-admins.
+ 'per_page' => 20, // The number of results to return per page.
+ 'page' => 1, // The page to return if limiting per page.
+ 'populate_extras' => true, // Fetch meta such as is_banned and is_member.
+ 'update_meta_cache' => true, // Pre-fetch groupmeta for queried groups.
</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"> $r = wp_parse_args( $args, $defaults );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $groups = BP_Groups_Group::get( array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'type' => $r['type'],
- 'user_id' => $r['user_id'],
- 'include' => $r['include'],
- 'exclude' => $r['exclude'],
- 'search_terms' => $r['search_terms'],
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'type' => $r['type'],
+ 'user_id' => $r['user_id'],
+ 'include' => $r['include'],
+ 'exclude' => $r['exclude'],
+ 'search_terms' => $r['search_terms'],
</ins><span class="cx" style="display: block; padding: 0 10px"> 'group_type' => $r['group_type'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'group_type__in' => $r['group_type__in'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'group_type__not_in' => $r['group_type__not_in'],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'meta_query' => $r['meta_query'],
- 'show_hidden' => $r['show_hidden'],
- 'per_page' => $r['per_page'],
- 'page' => $r['page'],
- 'populate_extras' => $r['populate_extras'],
- 'update_meta_cache' => $r['update_meta_cache'],
- 'order' => $r['order'],
- 'orderby' => $r['orderby'],
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'meta_query' => $r['meta_query'],
+ 'show_hidden' => $r['show_hidden'],
+ 'per_page' => $r['per_page'],
+ 'page' => $r['page'],
+ 'populate_extras' => $r['populate_extras'],
+ 'update_meta_cache' => $r['update_meta_cache'],
+ 'order' => $r['order'],
+ 'orderby' => $r['orderby'],
</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="trunksrcbpgroupsbpgroupstemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-groups/bp-groups-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-groups/bp-groups-template.php 2016-05-15 02:21:54 UTC (rev 10766)
+++ trunk/src/bp-groups/bp-groups-template.php 2016-05-15 02:30:51 UTC (rev 10767)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -106,57 +106,38 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array|string $args {
</span><span class="cx" style="display: block; padding: 0 10px"> * Array of parameters. All items are optional.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @type string $type Shorthand for certain orderby/
- * order combinations. 'newest',
- * 'active', 'popular', 'alphabetical',
- * 'random'. When present, will override
- * orderby and order params. Default: null.
- * @type string $order Sort order. 'ASC' or 'DESC'.
- * Default: 'DESC'.
- * @type string $orderby Property to sort by.
- * 'date_created', 'last_activity', 'total_member_count',
- * 'name', 'random'. Default: 'last_activity'.
- * @type int $page Page offset of results to return.
- * Default: 1 (first page of results).
- * @type int $per_page Number of items to return per page
- * of results. Default: 20.
- * @type int $max Does NOT affect query. May change the
- * reported number of total groups found,
- * but not the actual number of found
- * groups. Default: false.
- * @type bool $show_hidden Whether to include hidden groups in
- * results. Default: false.
- * @type string $page_arg Query argument used for pagination.
- * Default: 'grpage'.
- * @type int $user_id If provided, results will be limited
- * to groups of which the specified user
- * is a member.
- * Default: value of bp_displayed_user_id().
- * @type string $slug If provided, only the group with the
- * matching slug will be returned.
- * Default: false.
- * @type string $search_terms If provided, only groups whose names or
- * descriptions match the search terms will
- * be returned. Default: value of
- * `$_REQUEST['groups_search']` or
- * `$_REQUEST['s']`, if present. Otherwise false.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @type string $type Shorthand for certain orderby/order combinations. 'newest', 'active',
+ * 'popular', 'alphabetical', 'random'. When present, will override
+ * orderby and order params. Default: null.
+ * @type string $order Sort order. 'ASC' or 'DESC'. Default: 'DESC'.
+ * @type string $orderby Property to sort by. 'date_created', 'last_activity',
+ * 'total_member_count', 'name', 'random'. Default: 'last_activity'.
+ * @type int $page Page offset of results to return. Default: 1 (first page of results).
+ * @type int $per_page Number of items to return per page of results. Default: 20.
+ * @type int $max Does NOT affect query. May change the reported number of total groups
+ * found, but not the actual number of found groups. Default: false.
+ * @type bool $show_hidden Whether to include hidden groups in results. Default: false.
+ * @type string $page_arg Query argument used for pagination. Default: 'grpage'.
+ * @type int $user_id If provided, results will be limited to groups of which the specified
+ * user is a member. Default: value of bp_displayed_user_id().
+ * @type string $slug If provided, only the group with the matching slug will be returned.
+ * Default: false.
+ * @type string $search_terms If provided, only groups whose names or descriptions match the search
+ * terms will be returned. Default: value of `$_REQUEST['groups_search']` or
+ * `$_REQUEST['s']`, if present. Otherwise false.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @type array|string $group_type Array or comma-separated list of group types to limit results to.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type array|string $group_type__in Array or comma-separated list of group types to limit results to.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type array|string $group_type__not_in Array or comma-separated list of group types that will be
</span><span class="cx" style="display: block; padding: 0 10px"> * excluded from results.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @type array $meta_query An array of meta_query conditions.
- * See {@link WP_Meta_Query::queries} for description.
- * @type array|string $include Array or comma-separated list of
- * group IDs. Results will be limited
- * to groups within the list. Default: false.
- * @type bool $populate_extras Whether to fetch additional information
- * (such as member count) about groups.
- * Default: true.
- * @type array|string $exclude Array or comma-separated list of group IDs.
- * Results will exclude the listed groups.
- * Default: false.
- * @type bool $update_meta_cache Whether to fetch groupmeta for queried groups.
- * Default: true.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @type array $meta_query An array of meta_query conditions.
+ * See {@link WP_Meta_Query::queries} for description.
+ * @type array|string $include Array or comma-separated list of group IDs. Results will be limited
+ * to groups within the list. Default: false.
+ * @type bool $populate_extras Whether to fetch additional information (such as member count)
+ * about groups. Default: true.
+ * @type array|string $exclude Array or comma-separated list of group IDs. Results will exclude
+ * the listed groups. Default: false.
+ * @type bool $update_meta_cache Whether to fetch groupmeta for queried groups. Default: true.
</ins><span class="cx" style="display: block; padding: 0 10px"> * }
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool True if there are groups to display that match the params
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -200,48 +181,48 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Parse defaults and requested arguments.
</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">- 'type' => $type,
- 'order' => 'DESC',
- 'orderby' => 'last_activity',
- 'page' => 1,
- 'per_page' => 20,
- 'max' => false,
- 'show_hidden' => false,
- 'page_arg' => 'grpage',
- 'user_id' => bp_displayed_user_id(),
- 'slug' => $slug,
- 'search_terms' => $search_terms,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'type' => $type,
+ 'order' => 'DESC',
+ 'orderby' => 'last_activity',
+ 'page' => 1,
+ 'per_page' => 20,
+ 'max' => false,
+ 'show_hidden' => false,
+ 'page_arg' => 'grpage',
+ 'user_id' => bp_displayed_user_id(),
+ 'slug' => $slug,
+ 'search_terms' => $search_terms,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'group_type' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'group_type__in' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'group_type__not_in' => '',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'meta_query' => false,
- 'include' => false,
- 'exclude' => false,
- 'populate_extras' => true,
- 'update_meta_cache' => true,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'meta_query' => false,
+ 'include' => false,
+ 'exclude' => false,
+ 'populate_extras' => true,
+ 'update_meta_cache' => true,
</ins><span class="cx" style="display: block; padding: 0 10px"> ), 'has_groups' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Setup the Groups template global.
</span><span class="cx" style="display: block; padding: 0 10px"> $groups_template = new BP_Groups_Template( array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'type' => $r['type'],
- 'order' => $r['order'],
- 'orderby' => $r['orderby'],
- 'page' => (int) $r['page'],
- 'per_page' => (int) $r['per_page'],
- 'max' => (int) $r['max'],
- 'show_hidden' => $r['show_hidden'],
- 'page_arg' => $r['page_arg'],
- 'user_id' => (int) $r['user_id'],
- 'slug' => $r['slug'],
- 'search_terms' => $r['search_terms'],
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'type' => $r['type'],
+ 'order' => $r['order'],
+ 'orderby' => $r['orderby'],
+ 'page' => (int) $r['page'],
+ 'per_page' => (int) $r['per_page'],
+ 'max' => (int) $r['max'],
+ 'show_hidden' => $r['show_hidden'],
+ 'page_arg' => $r['page_arg'],
+ 'user_id' => (int) $r['user_id'],
+ 'slug' => $r['slug'],
+ 'search_terms' => $r['search_terms'],
</ins><span class="cx" style="display: block; padding: 0 10px"> 'group_type' => $r['group_type'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'group_type__in' => $r['group_type__in'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'group_type__not_in' => $r['group_type__not_in'],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'meta_query' => $r['meta_query'],
- 'include' => $r['include'],
- 'exclude' => $r['exclude'],
- 'populate_extras' => (bool) $r['populate_extras'],
- 'update_meta_cache' => (bool) $r['update_meta_cache'],
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'meta_query' => $r['meta_query'],
+ 'include' => $r['include'],
+ 'exclude' => $r['exclude'],
+ 'populate_extras' => (bool) $r['populate_extras'],
+ 'update_meta_cache' => (bool) $r['update_meta_cache'],
</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="trunksrcbpgroupsclassesclassbpgroupsgroupphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-groups/classes/class-bp-groups-group.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-groups/classes/class-bp-groups-group.php 2016-05-15 02:21:54 UTC (rev 10766)
+++ trunk/src/bp-groups/classes/class-bp-groups-group.php 2016-05-15 02:30:51 UTC (rev 10767)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -687,40 +687,36 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $args {
</span><span class="cx" style="display: block; padding: 0 10px"> * Array of parameters. All items are optional.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @type string $type Optional. Shorthand for certain orderby/
- * order combinations. 'newest', 'active', 'popular',
- * 'alphabetical', 'random'. When present, will override
- * orderby and order params. Default: null.
- * @type string $orderby Optional. Property to sort by.
- * 'date_created', 'last_activity', 'total_member_count',
- * 'name', 'random'. Default: 'date_created'.
- * @type string $order Optional. Sort order. 'ASC' or 'DESC'.
- * Default: 'DESC'.
- * @type int $per_page Optional. Number of items to return per page
- * of results. Default: null (no limit).
- * @type int $page Optional. Page offset of results to return.
- * Default: null (no limit).
- * @type int $user_id Optional. If provided, results will be limited to groups
- * of which the specified user is a member. Default: null.
- * @type string $search_terms Optional. If provided, only groups whose names
- * or descriptions match the search terms will be
- * returned. Default: false.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @type string $type Optional. Shorthand for certain orderby/order combinations.
+ * 'newest', 'active', 'popular', 'alphabetical', 'random'.
+ * When present, will override orderby and order params.
+ * Default: null.
+ * @type string $orderby Optional. Property to sort by. 'date_created', 'last_activity',
+ * 'total_member_count', 'name', 'random'. Default: 'date_created'.
+ * @type string $order Optional. Sort order. 'ASC' or 'DESC'. Default: 'DESC'.
+ * @type int $per_page Optional. Number of items to return per page of results.
+ * Default: null (no limit).
+ * @type int $page Optional. Page offset of results to return.
+ * Default: null (no limit).
+ * @type int $user_id Optional. If provided, results will be limited to groups
+ * of which the specified user is a member. Default: null.
+ * @type string $search_terms Optional. If provided, only groups whose names or descriptions
+ * match the search terms will be returned. Default: false.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @type array|string $group_type Array or comma-separated list of group types to limit results to.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type array|string $group_type__in Array or comma-separated list of group types to limit results to.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type array|string $group_type__not_in Array or comma-separated list of group types that will be
</span><span class="cx" style="display: block; padding: 0 10px"> * excluded from results.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @type array $meta_query Optional. An array of meta_query conditions.
- * See {@link WP_Meta_Query::queries} for description.
- * @type array|string $value Optional. Array or comma-separated list of group IDs.
- * Results will be limited to groups within the
- * list. Default: false.
- * @type bool $populate_extras Whether to fetch additional information
- * (such as member count) about groups. Default: true.
- * @type array|string $exclude Optional. Array or comma-separated list of group IDs.
- * Results will exclude the listed groups. Default: false.
- * @type bool $update_meta_cache Whether to pre-fetch groupmeta for
- * the returned groups. Default: true.
- * @type bool $show_hidden Whether to include hidden groups in results. Default: false.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @type array $meta_query Optional. An array of meta_query conditions.
+ * See {@link WP_Meta_Query::queries} for description.
+ * @type array|string $value Optional. Array or comma-separated list of group IDs. Results
+ * will be limited to groups within the list. Default: false.
+ * @type bool $populate_extras Whether to fetch additional information
+ * (such as member count) about groups. Default: true.
+ * @type array|string $exclude Optional. Array or comma-separated list of group IDs.
+ * Results will exclude the listed groups. Default: false.
+ * @type bool $update_meta_cache Whether to pre-fetch groupmeta for the returned groups.
+ * Default: true.
+ * @type bool $show_hidden Whether to include hidden groups in results. Default: false.
</ins><span class="cx" style="display: block; padding: 0 10px"> * }
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array {
</span><span class="cx" style="display: block; padding: 0 10px"> * @type array $groups Array of group objects returned by the
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -753,22 +749,22 @@
</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"> $defaults = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'type' => null,
- 'orderby' => 'date_created',
- 'order' => 'DESC',
- 'per_page' => null,
- 'page' => null,
- 'user_id' => 0,
- 'search_terms' => false,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'type' => null,
+ 'orderby' => 'date_created',
+ 'order' => 'DESC',
+ 'per_page' => null,
+ 'page' => null,
+ 'user_id' => 0,
+ 'search_terms' => false,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'group_type' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'group_type__in' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'group_type__not_in' => '',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'meta_query' => false,
- 'include' => false,
- 'populate_extras' => true,
- 'update_meta_cache' => true,
- 'exclude' => false,
- 'show_hidden' => false,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'meta_query' => false,
+ 'include' => false,
+ 'populate_extras' => true,
+ 'update_meta_cache' => true,
+ 'exclude' => false,
+ 'show_hidden' => 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"> $r = wp_parse_args( $args, $defaults );
</span></span></pre></div>
<a id="trunksrcbpgroupsclassesclassbpgroupstemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-groups/classes/class-bp-groups-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-groups/classes/class-bp-groups-template.php 2016-05-15 02:21:54 UTC (rev 10766)
+++ trunk/src/bp-groups/classes/class-bp-groups-template.php 2016-05-15 02:30:51 UTC (rev 10767)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -153,25 +153,25 @@
</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"> $defaults = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'page' => 1,
- 'per_page' => 20,
- 'page_arg' => 'grpage',
- 'max' => false,
- 'type' => 'active',
- 'order' => 'DESC',
- 'orderby' => 'date_created',
- 'show_hidden' => false,
- 'user_id' => 0,
- 'slug' => false,
- 'include' => false,
- 'exclude' => false,
- 'search_terms' => '',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'page' => 1,
+ 'per_page' => 20,
+ 'page_arg' => 'grpage',
+ 'max' => false,
+ 'type' => 'active',
+ 'order' => 'DESC',
+ 'orderby' => 'date_created',
+ 'show_hidden' => false,
+ 'user_id' => 0,
+ 'slug' => false,
+ 'include' => false,
+ 'exclude' => false,
+ 'search_terms' => '',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'group_type' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'group_type__in' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'group_type__not_in' => '',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'meta_query' => false,
- 'populate_extras' => true,
- 'update_meta_cache' => true,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'meta_query' => false,
+ 'populate_extras' => true,
+ 'update_meta_cache' => true,
</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"> $r = wp_parse_args( $args, $defaults );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -213,22 +213,22 @@
</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"> $this->groups = groups_get_groups( array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'type' => $type,
- 'order' => $order,
- 'orderby' => $orderby,
- 'per_page' => $this->pag_num,
- 'page' => $this->pag_page,
- 'user_id' => $user_id,
- 'search_terms' => $search_terms,
- 'meta_query' => $meta_query,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'type' => $type,
+ 'order' => $order,
+ 'orderby' => $orderby,
+ 'per_page' => $this->pag_num,
+ 'page' => $this->pag_page,
+ 'user_id' => $user_id,
+ 'search_terms' => $search_terms,
+ 'meta_query' => $meta_query,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'group_type' => $group_type,
</span><span class="cx" style="display: block; padding: 0 10px"> 'group_type__in' => $group_type__in,
</span><span class="cx" style="display: block; padding: 0 10px"> 'group_type__not_in' => $group_type__not_in,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'include' => $include,
- 'exclude' => $exclude,
- 'populate_extras' => $populate_extras,
- 'update_meta_cache' => $update_meta_cache,
- 'show_hidden' => $show_hidden
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'include' => $include,
+ 'exclude' => $exclude,
+ 'populate_extras' => $populate_extras,
+ 'update_meta_cache' => $update_meta_cache,
+ 'show_hidden' => $show_hidden,
</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>
</div>
</body>
</html>