<!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][3540] trunk: Revert part of r3537 to fix group admins/mods display.</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>3540</dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2010-12-19 11:10:20 +0000 (Sun, 19 Dec 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Revert part of r3537 to fix group admins/mods display. See #2661.</pre>
<h3>Modified Paths</h3>
<ul>
<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="trunkbpgroupsbpgroupstemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-templatetags.php (3539 => 3540)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-templatetags.php 2010-12-19 00:11:33 UTC (rev 3539)
+++ trunk/bp-groups/bp-groups-templatetags.php 2010-12-19 11:10:20 UTC (rev 3540)
</span><span class="lines">@@ -31,7 +31,9 @@
</span><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><del>- $this->groups = array( $bp->groups->current_group );
</del><ins>+ $group = new stdClass;
+ $group->group_id = BP_Groups_Group::get_id_from_slug( $slug );
+ $this->groups = array( $group );
</ins><span class="cx"> } else {
</span><span class="cx"> $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 ) );
</span><span class="cx"> }
</span><span class="lines">@@ -118,6 +120,9 @@
</span><span class="cx"> $this->in_the_loop = true;
</span><span class="cx"> $this->group = $this->next_group();
</span><span class="cx">
</span><ins>+ if ( $this->single_group )
+ $this->group = new BP_Groups_Group( $this->group->group_id );
+
</ins><span class="cx"> if ( 0 == $this->current_group ) // loop has just started
</span><span class="cx"> do_action('loop_start');
</span><span class="cx"> }
</span><span class="lines">@@ -1017,6 +1022,10 @@
</span><span class="cx"> /**
</span><span class="cx"> * Checks if a user is banned from a group.
</span><span class="cx"> *
</span><ins>+ * If this function is invoked inside the groups template loop (e.g. the group directory), then
+ * $groups_template->group->is_banned is set if the user is banned, so use that instead of making
+ * another SQL query.
+ *
</ins><span class="cx"> * @global object $bp BuddyPress global settings
</span><span class="cx"> * @global BP_Groups_Template $groups_template Group template loop object
</span><span class="cx"> * @param object $group Group to check if user is banned from the group
</span><span class="lines">@@ -1034,8 +1043,8 @@
</span><span class="cx"> if ( !$group ) {
</span><span class="cx"> $group =& $groups_template->group;
</span><span class="cx">
</span><del>- if ( !$user_id )
- return apply_filters( 'bp_group_is_member_banned', !empty( $group->is_banned ) );
</del><ins>+ if ( !$user_id && !empty( $group->is_banned ) )
+ return apply_filters( 'bp_group_is_member_banned', true );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( !$user_id )
</span></span></pre></div>
<a id="trunkbpgroupsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups.php (3539 => 3540)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups.php 2010-12-19 00:11:33 UTC (rev 3539)
+++ trunk/bp-groups.php 2010-12-19 11:10:20 UTC (rev 3540)
</span><span class="lines">@@ -51,8 +51,7 @@
</span><span class="cx">
</span><span class="cx"> /* This is a single group page. */
</span><span class="cx"> $bp->is_single_item = true;
</span><del>- $bp->groups->current_group = groups_get_groups( array( 'type' => 'active', 'include' => $group_id ) );
- $bp->groups->current_group = $bp->groups->current_group['groups'][0];
</del><ins>+ $bp->groups->current_group = new BP_Groups_Group( $group_id );
</ins><span class="cx">
</span><span class="cx"> /* Using "item" not "group" for generic support in other components. */
</span><span class="cx"> if ( is_super_admin() )
</span></span></pre>
</div>
</div>
</body>
</html>