<!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][3648] trunk: Add show_hidden argument for bp_has_groups().</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>3648</dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2011-01-03 22:49:11 +0000 (Mon, 03 Jan 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add show_hidden argument for bp_has_groups(). Fixes #2377. Props boonebgorges and sorich87</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpgroupsbpgroupsclassesphp">trunk/bp-groups/bp-groups-classes.php</a></li>
<li><a href="#trunkbpgroupsbpgroupstemplatetagsphp">trunk/bp-groups/bp-groups-templatetags.php</a></li>
<li><a href="#trunkbpgroupsphp">trunk/bp-groups.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 (3647 => 3648)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-classes.php 2011-01-02 14:42:49 UTC (rev 3647)
+++ trunk/bp-groups/bp-groups-classes.php 2011-01-03 22:49:11 UTC (rev 3648)
</span><span class="lines">@@ -255,7 +255,7 @@
</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 = false, $search_terms = false, $include = false, $populate_extras = true, $exclude = false ) {
</del><ins>+ function get( $type = 'newest', $per_page = null, $page = null, $user_id = false, $search_terms = false, $include = false, $populate_extras = true, $exclude = false, $show_hidden = false ) {
</ins><span class="cx"> global $wpdb, $bp;
</span><span class="cx">
</span><span class="cx"> $sql = array();
</span><span class="lines">@@ -273,7 +273,7 @@
</span><span class="cx">
</span><span class="cx"> $sql['where'] = " g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count'";
</span><span class="cx">
</span><del>- if ( !is_user_logged_in() || ( !is_super_admin() && ( $user_id != $bp->loggedin_user->id ) ) )
</del><ins>+ if ( !$show_hidden )
</ins><span class="cx"> $sql['hidden'] = " AND g.status != 'hidden'";
</span><span class="cx">
</span><span class="cx"> if ( $search_terms ) {
</span><span class="lines">@@ -1153,8 +1153,8 @@
</span><span class="cx"> // Catch the edit screen and forward it to the plugin template
</span><span class="cx"> if ( $bp->current_component == $bp->groups->slug && 'admin' == $bp->current_action && !empty( $bp->action_variables[0] ) && $this->slug == $bp->action_variables[0] ) {
</span><span class="cx"> // Check whether the user is saving changes
</span><del>- $this->edit_screen_save();
-
</del><ins>+ $this->edit_screen_save();
+
</ins><span class="cx"> add_action( 'groups_custom_edit_steps', array( &$this, 'edit_screen' ) );
</span><span class="cx">
</span><span class="cx"> if ( '' != locate_template( array( 'groups/single/home.php' ), false ) ) {
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupstemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-templatetags.php (3647 => 3648)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-templatetags.php 2011-01-02 14:42:49 UTC (rev 3647)
+++ trunk/bp-groups/bp-groups-templatetags.php 2011-01-03 22:49:11 UTC (rev 3648)
</span><span class="lines">@@ -22,12 +22,15 @@
</span><span class="cx"> var $sort_by;
</span><span class="cx"> var $order;
</span><span class="cx">
</span><del>- function bp_groups_template( $user_id, $type, $page, $per_page, $max, $slug, $search_terms, $include, $populate_extras, $exclude ) {
</del><ins>+ function bp_groups_template( $user_id, $type, $page, $per_page, $max, $slug, $search_terms, $include, $populate_extras, $exclude, $show_hidden ) {
</ins><span class="cx"> global $bp;
</span><span class="cx">
</span><span class="cx"> $this->pag_page = isset( $_REQUEST['grpage'] ) ? intval( $_REQUEST['grpage'] ) : $page;
</span><span class="cx"> $this->pag_num = isset( $_REQUEST['num'] ) ? intval( $_REQUEST['num'] ) : $per_page;
</span><span class="cx">
</span><ins>+ if ( $bp->loggedin_user->is_super_admin || ( is_user_logged_in() && $user_id == $bp->loggedin_user->id ) )
+ $show_hidden = true;
+
</ins><span class="cx"> if ( 'invites' == $type ) {
</span><span class="cx"> $this->groups = groups_get_invites_for_user( $user_id, $this->pag_num, $this->pag_page, $exclude );
</span><span class="cx"> } else if ( 'single-group' == $type ) {
</span><span class="lines">@@ -35,7 +38,7 @@
</span><span class="cx"> $group->group_id = BP_Groups_Group::get_id_from_slug( $slug );
</span><span class="cx"> $this->groups = array( $group );
</span><span class="cx"> } else {
</span><del>- $this->groups = groups_get_groups( array( 'type' => $type, 'per_page' => $this->pag_num, 'page' => $this->pag_page, 'user_id' => $user_id, 'search_terms' => $search_terms, 'include' => $include, 'exclude' => $exclude, 'populate_extras' => $populate_extras ) );
</del><ins>+ $this->groups = groups_get_groups( array( 'type' => $type, 'per_page' => $this->pag_num, 'page' => $this->pag_page, 'user_id' => $user_id, 'search_terms' => $search_terms, 'include' => $include, 'exclude' => $exclude, 'populate_extras' => $populate_extras, 'show_hidden' => $show_hidden ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( 'invites' == $type ) {
</span><span class="lines">@@ -136,10 +139,9 @@
</span><span class="cx"> * if arguments are directly passed into the loop. Custom plugins should always
</span><span class="cx"> * pass their parameters directly to the loop.
</span><span class="cx"> */
</span><ins>+ $slug = false;
</ins><span class="cx"> $type = 'active';
</span><del>- $user_id = false;
- $search_terms = null;
- $slug = false;
</del><ins>+ $user_id = 0;
</ins><span class="cx">
</span><span class="cx"> /* User filtering */
</span><span class="cx"> if ( !empty( $bp->displayed_user->id ) )
</span><span class="lines">@@ -164,10 +166,11 @@
</span><span class="cx"> 'page' => 1,
</span><span class="cx"> 'per_page' => 20,
</span><span class="cx"> 'max' => false,
</span><ins>+ 'show_hidden' => false,
</ins><span class="cx">
</span><span class="cx"> 'user_id' => $user_id, // Pass a user ID to limit to groups this user has joined
</span><span class="cx"> 'slug' => $slug, // Pass a group slug to only return that group
</span><del>- 'search_terms' => $search_terms, // Pass search terms to return only matching groups
</del><ins>+ 'search_terms' => '', // Pass search terms to return only matching groups
</ins><span class="cx"> 'include' => false, // Pass comma separated list of group ID's to return only these groups
</span><span class="cx"> 'exclude' => false, // Pass comma separated list of group ID's to exclude these groups
</span><span class="cx">
</span><span class="lines">@@ -186,7 +189,7 @@
</span><span class="cx"> $search_terms = false;
</span><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, $include, (bool)$populate_extras, $exclude );
</del><ins>+ $groups_template = new BP_Groups_Template( (int)$user_id, $type, (int)$page, (int)$per_page, (int)$max, $slug, $search_terms, $include, (bool)$populate_extras, $exclude, $show_hidden );
</ins><span class="cx"> return apply_filters( 'bp_has_groups', $groups_template->has_groups(), $groups_template );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1871,8 +1874,8 @@
</span><span class="cx"> function bp_directory_groups_search_form() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><del>- $default_search_value = bp_get_search_default_text();
- $search_value = !empty( $_REQUEST['s'] ) ? stripslashes( $_REQUEST['s'] ) : $default_search_value;
</del><ins>+ $default_search_value = bp_get_search_default_text();
+ $search_value = !empty( $_REQUEST['s'] ) ? stripslashes( $_REQUEST['s'] ) : $default_search_value;
</ins><span class="cx">
</span><span class="cx"> ?>
</span><span class="cx"> <form action="" method="get" id="search-groups-form">
</span></span></pre></div>
<a id="trunkbpgroupsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups.php (3647 => 3648)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups.php 2011-01-02 14:42:49 UTC (rev 3647)
+++ trunk/bp-groups.php 2011-01-03 22:49:11 UTC (rev 3648)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> $bp->groups->auto_join = defined( 'BP_DISABLE_AUTO_GROUP_JOIN' ) ? false : true;
</span><span class="cx">
</span><span class="cx"> // The default text for the groups directory search box
</span><del>- $bp->default_search_strings[$bp->groups->slug] = __( 'Search Groups...', 'buddypress' );
</del><ins>+ $bp->default_search_strings[$bp->groups->slug] = __( 'Search Groups...', 'buddypress' );
</ins><span class="cx">
</span><span class="cx"> do_action( 'groups_setup_globals' );
</span><span class="cx"> }
</span><span class="lines">@@ -1819,6 +1819,7 @@
</span><span class="cx"> 'include' => false, // Only include these specific groups (group_ids)
</span><span class="cx"> 'exclude' => false, // Do not include these specific groups (group_ids)
</span><span class="cx"> 'search_terms' => false, // Limit to groups that match these search terms
</span><ins>+ 'show_hidden' => false, // Show hidden groups to non-admins
</ins><span class="cx">
</span><span class="cx"> 'per_page' => 20, // The number of results to return per page
</span><span class="cx"> 'page' => 1, // The page to return if limiting per page
</span><span class="lines">@@ -1828,7 +1829,7 @@
</span><span class="cx"> $params = wp_parse_args( $args, $defaults );
</span><span class="cx"> extract( $params, EXTR_SKIP );
</span><span class="cx">
</span><del>- $groups = BP_Groups_Group::get( $type, $per_page, $page, $user_id, $search_terms, $include, $populate_extras, $exclude );
</del><ins>+ $groups = BP_Groups_Group::get( $type, $per_page, $page, $user_id, $search_terms, $include, $populate_extras, $exclude, $show_hidden );
</ins><span class="cx">
</span><span class="cx"> return apply_filters( 'groups_get_groups', $groups, &$params );
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>