<!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][6321] trunk/bp-groups: Converts bp_has_groups() stack to accept parameters as an array.</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, #logmsg > ol { margin-left: 0; 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/6321">6321</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2012-09-08 03:12:39 +0000 (Sat, 08 Sep 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Converts bp_has_groups() stack to accept parameters as an array.
Arguments passed in the old style are converted to an array automatically, for
backward compatibility.
See <a href="http://buddypress.trac.wordpress.org/ticket/3797">#3797</a></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 (6320 => 6321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-classes.php 2012-09-07 18:05:37 UTC (rev 6320)
+++ trunk/bp-groups/bp-groups-classes.php 2012-09-08 03:12:39 UTC (rev 6321)
</span><span class="lines">@@ -305,9 +305,44 @@
</span><span class="cx"> return array( 'requests' => $paged_requests, 'total' => $total_requests );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function get( $type = 'newest', $per_page = null, $page = null, $user_id = 0, $search_terms = false, $include = false, $populate_extras = true, $exclude = false, $show_hidden = false ) {
</del><ins>+ function get( $args = array() ) {
</ins><span class="cx"> global $wpdb, $bp;
</span><span class="cx">
</span><ins>+ // Backward compatibility with old method of passing arguments
+ if ( ! is_array( $args ) || func_num_args() > 1 ) {
+ _deprecated_argument( __METHOD__, '1.7', sprintf( __( 'Arguments passed to %1$s should be in an associative array. See the inline documentation at %2$s for more details.', 'buddypress' ), __METHOD__, __FILE__ ) );
+
+ $old_args_keys = array(
+ 0 => 'type',
+ 1 => 'per_page',
+ 2 => 'page',
+ 3 => 'user_id',
+ 4 => 'search_terms',
+ 5 => 'include',
+ 6 => 'populate_extras',
+ 7 => 'exclude',
+ 8 => 'show_hidden',
+ );
+
+ $func_args = func_get_args();
+ $args = bp_core_parse_args_array( $old_args_keys, $func_args );
+ }
+
+ $defaults = array(
+ 'type' => 'newest',
+ 'per_page' => null,
+ 'page' => null,
+ 'user_id' => 0,
+ 'search_terms' => false,
+ 'include' => false,
+ 'populate_extras' => true,
+ 'exclude' => false,
+ 'show_hidden' => false
+ );
+
+ $r = wp_parse_args( $args, $defaults );
+ extract( $r );
+
</ins><span class="cx"> $sql = array();
</span><span class="cx"> $total_sql = array();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-functions.php (6320 => 6321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-functions.php 2012-09-07 18:05:37 UTC (rev 6320)
+++ trunk/bp-groups/bp-groups-functions.php 2012-09-08 03:12:39 UTC (rev 6321)
</span><span class="lines">@@ -389,6 +389,14 @@
</span><span class="cx">
</span><span class="cx"> /*** Group Fetching, Filtering & Searching *************************************/
</span><span class="cx">
</span><ins>+/**
+ * Get a collection of groups, based on the parameters passed
+ *
+ * @uses apply_filters_ref_array() Filter 'groups_get_groups' to modify return value
+ * @uses BP_Groups_Group::get()
+ * @param array $args See inline documentation for details
+ * @return array
+ */
</ins><span class="cx"> function groups_get_groups( $args = '' ) {
</span><span class="cx">
</span><span class="cx"> $defaults = array(
</span><span class="lines">@@ -403,12 +411,21 @@
</span><span class="cx"> 'populate_extras' => true, // Fetch meta such as is_banned and is_member
</span><span class="cx"> );
</span><span class="cx">
</span><del>- $params = wp_parse_args( $args, $defaults );
- extract( $params, EXTR_SKIP );
</del><ins>+ $r = wp_parse_args( $args, $defaults );
</ins><span class="cx">
</span><del>- $groups = BP_Groups_Group::get( $type, $per_page, $page, $user_id, $search_terms, $include, $populate_extras, $exclude, $show_hidden );
</del><ins>+ $groups = BP_Groups_Group::get( array(
+ 'type' => $r['type'],
+ 'user_id' => $r['user_id'],
+ 'include' => $r['include'],
+ 'exclude' => $r['exclude'],
+ 'search_terms' => $r['search_terms'],
+ 'show_hidden' => $r['show_hidden'],
+ 'per_page' => $r['per_page'],
+ 'page' => $r['page'],
+ 'populate_extras' => $r['populate_extras']
+ ) );
</ins><span class="cx">
</span><del>- return apply_filters_ref_array( 'groups_get_groups', array( &$groups, &$params ) );
</del><ins>+ return apply_filters_ref_array( 'groups_get_groups', array( &$groups, &$r ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function groups_get_total_group_count() {
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-template.php (6320 => 6321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-template.php 2012-09-07 18:05:37 UTC (rev 6320)
+++ trunk/bp-groups/bp-groups-template.php 2012-09-08 03:12:39 UTC (rev 6321)
</span><span class="lines">@@ -107,8 +107,49 @@
</span><span class="cx"> var $sort_by;
</span><span class="cx"> var $order;
</span><span class="cx">
</span><del>- function __construct( $user_id, $type, $page, $per_page, $max, $slug, $search_terms, $populate_extras, $include = false, $exclude = false, $show_hidden = false, $page_arg = 'grpage' ){
</del><ins>+ function __construct( $args = array() ){
</ins><span class="cx">
</span><ins>+ // Backward compatibility with old method of passing arguments
+ if ( ! is_array( $args ) || func_num_args() > 1 ) {
+ _deprecated_argument( __METHOD__, '1.7', sprintf( __( 'Arguments passed to %1$s should be in an associative array. See the inline documentation at %2$s for more details.', 'buddypress' ), __METHOD__, __FILE__ ) );
+
+ $old_args_keys = array(
+ 0 => 'user_id',
+ 1 => 'type',
+ 2 => 'page',
+ 3 => 'per_page',
+ 4 => 'max',
+ 5 => 'slug',
+ 6 => 'search_terms',
+ 7 => 'populate_extras',
+ 8 => 'include',
+ 9 => 'exclude',
+ 10 => 'show_hidden',
+ 11 => 'page_arg',
+ );
+
+ $func_args = func_get_args();
+ $args = bp_core_parse_args_array( $old_args_keys, $func_args );
+ }
+
+ $defaults = array(
+ 'type' => 'active',
+ 'page' => 1,
+ 'per_page' => 20,
+ 'max' => false,
+ 'show_hidden' => false,
+ 'page_arg' => 'grpage',
+ 'user_id' => 0,
+ 'slug' => false,
+ 'include' => false,
+ 'exclude' => false,
+ 'search_terms' => '',
+ 'populate_extras' => true
+ );
+
+ $r = wp_parse_args( $args, $defaults );
+ extract( $r );
+
</ins><span class="cx"> $this->pag_page = isset( $_REQUEST[$page_arg] ) ? intval( $_REQUEST[$page_arg] ) : $page;
</span><span class="cx"> $this->pag_num = isset( $_REQUEST['num'] ) ? intval( $_REQUEST['num'] ) : $per_page;
</span><span class="cx">
</span><span class="lines">@@ -273,19 +314,32 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $r = wp_parse_args( $args, $defaults );
</span><del>- extract( $r );
</del><span class="cx">
</span><del>- if ( empty( $search_terms ) ) {
</del><ins>+ if ( empty( $r['search_terms'] ) ) {
</ins><span class="cx"> if ( isset( $_REQUEST['group-filter-box'] ) && !empty( $_REQUEST['group-filter-box'] ) )
</span><del>- $search_terms = $_REQUEST['group-filter-box'];
</del><ins>+ $r['search_terms'] = $_REQUEST['group-filter-box'];
</ins><span class="cx"> elseif ( isset( $_REQUEST['s'] ) && !empty( $_REQUEST['s'] ) )
</span><del>- $search_terms = $_REQUEST['s'];
</del><ins>+ $r['search_terms'] = $_REQUEST['s'];
</ins><span class="cx"> else
</span><del>- $search_terms = false;
</del><ins>+ $r['search_terms'] = false;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- $groups_template = new BP_Groups_Template( (int) $user_id, $type, (int) $page, (int) $per_page, (int) $max, $slug, $search_terms, (bool)$populate_extras, $include, $exclude, $show_hidden, $page_arg );
- return apply_filters( 'bp_has_groups', $groups_template->has_groups(), $groups_template );
</del><ins>+ $groups_template = new BP_Groups_Template( array(
+ 'type' => $r['type'],
+ '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'],
+ 'include' => $r['include'],
+ 'exclude' => $r['exclude'],
+ 'populate_extras' => (bool) $r['populate_extras']
+ ) );
+
+ return apply_filters( 'bp_has_groups', $groups_template->has_groups(), $groups_template, $r );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_groups() {
</span></span></pre>
</div>
</div>
</body>
</html>