<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[BuddyPress] [1904] trunk: Group fixes.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>1904</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2009-09-21 16:49:17 +0000 (Mon, 21 Sep 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Group fixes.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorephp">trunk/bp-core.php</a></li>
<li><a href="#trunkbpgroupsbpgroupsclassesphp">trunk/bp-groups/bp-groups-classes.php</a></li>
<li><a href="#trunkbpgroupsphp">trunk/bp-groups.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcorephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core.php (1903 => 1904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core.php 2009-09-18 14:11:06 UTC (rev 1903)
+++ trunk/bp-core.php 2009-09-21 16:49:17 UTC (rev 1904)
</span><span class="lines">@@ -622,8 +622,10 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if ( $bp->current_component == $slug && !$bp->current_action ) {
</span><del>- if ( function_exists( $screen_function ) )
- add_action( 'wp', $function, 3 );
</del><ins>+ if ( !is_object( $screen_function[0] ) )
+ add_action( 'wp', $screen_function, 3 );
+ else
+ add_action( 'wp', array( &$screen_function[0], $screen_function[1] ), 3 );
</ins><span class="cx">
</span><span class="cx"> if ( $default_subnav_slug )
</span><span class="cx"> $bp->current_action = $default_subnav_slug;
</span><span class="lines">@@ -725,7 +727,7 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> if ( ( $bp->current_action == $slug && $bp->current_component == $parent_slug ) && $user_has_access ) {
</span><del>- if ( !is_object($screen_function[0]) )
</del><ins>+ if ( !is_object( $screen_function[0] ) )
</ins><span class="cx"> add_action( 'wp', $screen_function, 3 );
</span><span class="cx"> else
</span><span class="cx"> add_action( 'wp', array( &$screen_function[0], $screen_function[1] ), 3 );
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupsclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-classes.php (1903 => 1904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-classes.php 2009-09-18 14:11:06 UTC (rev 1903)
+++ trunk/bp-groups/bp-groups-classes.php 2009-09-21 16:49:17 UTC (rev 1904)
</span><span class="lines">@@ -252,8 +252,8 @@
</span><span class="cx"> $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
</span><span class="cx">
</span><span class="cx"> // Get all the group ids for the current user's groups.
</span><del>- $gids = BP_Groups_Member::get_group_ids( $user_id, false, false, false, true );
-
</del><ins>+ $gids = BP_Groups_Member::get_group_ids( $user_id );
+
</ins><span class="cx"> if ( !$gids['groups'] )
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -620,7 +620,7 @@
</span><span class="cx"> return $delete_result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function get_group_ids( $user_id, $limit = false, $page = false, $get_total = true, $as_col = false ) {
</del><ins>+ function get_group_ids( $user_id, $limit = false, $page = false ) {
</ins><span class="cx"> global $wpdb, $bp;
</span><span class="cx">
</span><span class="cx"> if ( $limit && $page )
</span><span class="lines">@@ -635,12 +635,9 @@
</span><span class="cx"> $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT count(m.group_id) FROM {$bp->groups->table_name_members} m, {$bp->groups->table_name} g WHERE m.group_id = g.id AND g.status != 'hidden' AND m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0", $user_id ) );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( $as_col )
- $paged_groups = $wpdb->get_col( $group_sql );
- else
- $paged_groups = $wpdb->get_results( $group_sql );
</del><ins>+ $groups = $wpdb->get_col( $group_sql );
</ins><span class="cx">
</span><del>- return array( 'groups' => $paged_groups, 'total' => $total_groups );
</del><ins>+ return array( 'groups' => $groups, 'total' => (int) $total_groups );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function get_recently_joined( $user_id, $limit = false, $page = false, $filter = false ) {
</span></span></pre></div>
<a id="trunkbpgroupsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups.php (1903 => 1904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups.php 2009-09-18 14:11:06 UTC (rev 1903)
+++ trunk/bp-groups.php 2009-09-21 16:49:17 UTC (rev 1904)
</span><span class="lines">@@ -1841,12 +1841,13 @@
</span><span class="cx"> return BP_Groups_Group::get_random();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function groups_get_user_groups( $pag_num, $pag_page ) {
</del><ins>+function groups_get_user_groups( $user_id = false, $pag_num = false, $pag_page = false ) {
</ins><span class="cx"> global $bp;
</span><span class="cx">
</span><del>- $groups = BP_Groups_Member::get_group_ids( $bp->displayed_user->id, $pag_num, $pag_page );
-
- return array( 'groups' => $groups['ids'], 'total' => $groups['total'] );
</del><ins>+ if ( !$user_id )
+ $user_id = $bp->displayed_user->id;
+
+ return BP_Groups_Member::get_group_ids( $user_id, $pag_num, $pag_page );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function groups_get_recently_joined_for_user( $user_id = false, $pag_num = false, $pag_page = false, $filter = false ) {
</span></span></pre>
</div>
</div>
</body>
</html>