<!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][7897] trunk/bp-groups: Normalize whitespace in bp_has_groups() parameter stack</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/7897">7897</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2014-02-16 21:36:18 +0000 (Sun, 16 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Normalize whitespace in bp_has_groups() parameter stack</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpgroupsbpgroupsclassesphp">trunk/bp-groups/bp-groups-classes.php</a></li>
<li><a href="#trunkbpgroupsbpgroupsfunctionsphp">trunk/bp-groups/bp-groups-functions.php</a></li>
<li><a href="#trunkbpgroupsbpgroupstemplatephp">trunk/bp-groups/bp-groups-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpgroupsbpgroupsclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-classes.php (7896 => 7897)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-classes.php 2014-02-16 21:35:15 UTC (rev 7896)
+++ trunk/bp-groups/bp-groups-classes.php 2014-02-16 21:36:18 UTC (rev 7897)
</span><span class="lines">@@ -599,19 +599,19 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $defaults = array(
</span><del>- 'type' => null,
- 'orderby' => 'date_created',
- 'order' => 'DESC',
- 'per_page' => null,
- 'page' => null,
- 'user_id' => 0,
- 'search_terms' => false,
- 'meta_query' => false,
- 'include' => false,
- 'populate_extras' => true,
</del><ins>+ 'type' => null,
+ 'orderby' => 'date_created',
+ 'order' => 'DESC',
+ 'per_page' => null,
+ 'page' => null,
+ 'user_id' => 0,
+ 'search_terms' => false,
+ 'meta_query' => false,
+ 'include' => false,
+ 'populate_extras' => true,
</ins><span class="cx"> 'update_meta_cache' => true,
</span><del>- 'exclude' => false,
- 'show_hidden' => false,
</del><ins>+ 'exclude' => false,
+ 'show_hidden' => false,
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $r = wp_parse_args( $args, $defaults );
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-functions.php (7896 => 7897)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-functions.php 2014-02-16 21:35:15 UTC (rev 7896)
+++ trunk/bp-groups/bp-groups-functions.php 2014-02-16 21:36:18 UTC (rev 7897)
</span><span class="lines">@@ -435,37 +435,37 @@
</span><span class="cx"> function groups_get_groups( $args = '' ) {
</span><span class="cx">
</span><span class="cx"> $defaults = array(
</span><del>- '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
- '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
</del><ins>+ '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
+ '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
</ins><span class="cx"> 'update_meta_cache' => true, // Pre-fetch groupmeta for queried groups
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $r = wp_parse_args( $args, $defaults );
</span><span class="cx">
</span><span class="cx"> $groups = BP_Groups_Group::get( array(
</span><del>- 'type' => $r['type'],
- 'user_id' => $r['user_id'],
- 'include' => $r['include'],
- 'exclude' => $r['exclude'],
- 'search_terms' => $r['search_terms'],
- 'meta_query' => $r['meta_query'],
- 'show_hidden' => $r['show_hidden'],
- 'per_page' => $r['per_page'],
- 'page' => $r['page'],
- 'populate_extras' => $r['populate_extras'],
</del><ins>+ 'type' => $r['type'],
+ 'user_id' => $r['user_id'],
+ 'include' => $r['include'],
+ 'exclude' => $r['exclude'],
+ 'search_terms' => $r['search_terms'],
+ 'meta_query' => $r['meta_query'],
+ 'show_hidden' => $r['show_hidden'],
+ 'per_page' => $r['per_page'],
+ 'page' => $r['page'],
+ 'populate_extras' => $r['populate_extras'],
</ins><span class="cx"> 'update_meta_cache' => $r['update_meta_cache'],
</span><del>- 'order' => $r['order'],
- 'orderby' => $r['orderby'],
</del><ins>+ 'order' => $r['order'],
+ 'orderby' => $r['orderby'],
</ins><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> return apply_filters_ref_array( 'groups_get_groups', array( &$groups, &$r ) );
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-template.php (7896 => 7897)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-template.php 2014-02-16 21:35:15 UTC (rev 7896)
+++ trunk/bp-groups/bp-groups-template.php 2014-02-16 21:36:18 UTC (rev 7897)
</span><span class="lines">@@ -164,19 +164,19 @@
</span><span class="cx"> $this->groups = array( $group );
</span><span class="cx"> } else {
</span><span class="cx"> $this->groups = groups_get_groups( array(
</span><del>- '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,
- 'include' => $include,
- 'exclude' => $exclude,
- 'populate_extras' => $populate_extras,
</del><ins>+ '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,
+ 'include' => $include,
+ 'exclude' => $exclude,
+ 'populate_extras' => $populate_extras,
</ins><span class="cx"> 'update_meta_cache' => $update_meta_cache,
</span><del>- 'show_hidden' => $show_hidden
</del><ins>+ 'show_hidden' => $show_hidden
</ins><span class="cx"> ) );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -312,24 +312,24 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $defaults = array(
</span><del>- 'type' => $type, // 'type' is an override for 'order' and 'orderby'. See docblock.
- 'order' => 'DESC',
- 'orderby' => 'last_activity',
- 'page' => 1,
- 'per_page' => 20,
- 'max' => false,
- 'show_hidden' => false,
</del><ins>+ 'type' => $type, // 'type' is an override for 'order' and 'orderby'. See docblock.
+ 'order' => 'DESC',
+ 'orderby' => 'last_activity',
+ 'page' => 1,
+ 'per_page' => 20,
+ 'max' => false,
+ 'show_hidden' => false,
</ins><span class="cx">
</span><del>- 'page_arg' => 'grpage', // See https://buddypress.trac.wordpress.org/ticket/3679
</del><ins>+ 'page_arg' => 'grpage', // See https://buddypress.trac.wordpress.org/ticket/3679
</ins><span class="cx">
</span><del>- 'user_id' => $user_id, // Pass a user ID to limit to groups this user has joined
- 'slug' => $slug, // Pass a group slug to only return that group
- 'search_terms' => '', // Pass search terms to return only matching groups
- 'meta_query' => false, // Filter by groupmeta. See WP_Meta_Query for format
- 'include' => false, // Pass comma separated list or array of group ID's to return only these groups
- 'exclude' => false, // Pass comma separated list or array of group ID's to exclude these groups
</del><ins>+ 'user_id' => $user_id, // Pass a user ID to limit to groups this user has joined
+ 'slug' => $slug, // Pass a group slug to only return that group
+ 'search_terms' => '', // Pass search terms to return only matching groups
+ 'meta_query' => false, // Filter by groupmeta. See WP_Meta_Query for format
+ 'include' => false, // Pass comma separated list or array of group ID's to return only these groups
+ 'exclude' => false, // Pass comma separated list or array of group ID's to exclude these groups
</ins><span class="cx">
</span><del>- 'populate_extras' => true, // Get extra meta - is_member, is_banned
</del><ins>+ 'populate_extras' => true, // Get extra meta - is_member, is_banned
</ins><span class="cx"> 'update_meta_cache' => true,
</span><span class="cx"> );
</span><span class="cx">
</span><span class="lines">@@ -345,21 +345,21 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $groups_template = new BP_Groups_Template( array(
</span><del>- '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'],
- 'meta_query' => $r['meta_query'],
- 'include' => $r['include'],
- 'exclude' => $r['exclude'],
- 'populate_extras' => (bool) $r['populate_extras'],
</del><ins>+ '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'],
+ 'meta_query' => $r['meta_query'],
+ 'include' => $r['include'],
+ 'exclude' => $r['exclude'],
+ 'populate_extras' => (bool) $r['populate_extras'],
</ins><span class="cx"> 'update_meta_cache' => (bool) $r['update_meta_cache'],
</span><span class="cx"> ) );
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>