<!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][3555] trunk: More glorious WP_DEBUG fixes</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>3555</dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2010-12-22 01:13:29 +0000 (Wed, 22 Dec 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>More glorious WP_DEBUG fixes</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcoreclassesphp">trunk/bp-core/bp-core-classes.php</a></li>
<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="trunkbpcorebpcoreclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-classes.php (3554 => 3555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-classes.php 2010-12-22 00:56:29 UTC (rev 3554)
+++ trunk/bp-core/bp-core-classes.php 2010-12-22 01:13:29 UTC (rev 3555)
</span><span class="lines">@@ -506,8 +506,7 @@
</span><span class="cx"> function delete_for_user_by_item_id( $user_id, $item_id, $component_name, $component_action, $secondary_item_id ) {
</span><span class="cx"> global $wpdb, $bp;
</span><span class="cx">
</span><del>- if ( $secondary_item_id )
- $secondary_item_sql = $wpdb->prepare( " AND secondary_item_id = %d", $secondary_item_id );
</del><ins>+ $secondary_item_sql = !empty( $secondary_item_id ) ? $wpdb->prepare( " AND secondary_item_id = %d", $secondary_item_id ) : '';
</ins><span class="cx">
</span><span class="cx"> return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->core->table_name_notifications} WHERE user_id = %d AND item_id = %d AND component_name = %s AND component_action = %s{$secondary_item_sql}", $user_id, $item_id, $component_name, $component_action ) );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupsclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-classes.php (3554 => 3555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-classes.php 2010-12-22 00:56:29 UTC (rev 3554)
+++ trunk/bp-groups/bp-groups-classes.php 2010-12-22 01:13:29 UTC (rev 3555)
</span><span class="lines">@@ -865,11 +865,9 @@
</span><span class="cx"> function get_invites( $user_id, $limit = false, $page = false, $exclude = false ) {
</span><span class="cx"> global $wpdb, $bp;
</span><span class="cx">
</span><del>- if ( $limit && $page )
- $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
</del><ins>+ $pag_sql = ( !empty( $limit ) && !empty( $page ) ) ? $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) ) : '';
</ins><span class="cx">
</span><del>- if ( $exclude )
- $exclude_sql = $wpdb->prepare( " AND g.id NOT IN (%s)", $exclude );
</del><ins>+ $exclude_sql = !empty( $exclude ) ? $wpdb->prepare( " AND g.id NOT IN (%s)", $exclude ) : '';
</ins><span class="cx">
</span><span class="cx"> $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT g.*, gm1.meta_value as total_member_count, gm2.meta_value as last_activity FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2, {$bp->groups->table_name_members} m, {$bp->groups->table_name} g WHERE g.id = m.group_id AND g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count' AND m.is_confirmed = 0 AND m.inviter_id != 0 AND m.invite_sent = 1 AND m.user_id = %d {$exclude_sql} ORDER BY m.date_modified ASC {$pag_sql}", $user_id ) );
</span><span class="cx"> $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(DISTINCT m.group_id) FROM {$bp->groups->table_name_members} m, {$bp->groups->table_name} g WHERE m.group_id = g.id AND m.is_confirmed = 0 AND m.inviter_id != 0 AND m.invite_sent = 1 AND m.user_id = %d {$exclude_sql} ORDER BY date_modified ASC", $user_id ) );
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupstemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-templatetags.php (3554 => 3555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-templatetags.php 2010-12-22 00:56:29 UTC (rev 3554)
+++ trunk/bp-groups/bp-groups-templatetags.php 2010-12-22 01:13:29 UTC (rev 3555)
</span><span class="lines">@@ -1846,7 +1846,7 @@
</span><span class="cx"> extract( $r, EXTR_SKIP );
</span><span class="cx">
</span><span class="cx"> if ( !$group_id )
</span><del>- $group_id = ( $bp->groups->new_group_id ) ? $bp->groups->new_group_id : $bp->groups->current_group->id;
</del><ins>+ $group_id = !empty( $bp->groups->new_group_id ) ? $bp->groups->new_group_id : $bp->groups->current_group->id;
</ins><span class="cx">
</span><span class="cx"> $friends = friends_get_friends_invite_list( $bp->loggedin_user->id, $group_id );
</span><span class="cx">
</span><span class="lines">@@ -1854,12 +1854,11 @@
</span><span class="cx"> $invites = groups_get_invites_for_group( $bp->loggedin_user->id, $group_id );
</span><span class="cx">
</span><span class="cx"> for ( $i = 0; $i < count( $friends ); $i++ ) {
</span><del>- if ( $invites ) {
- if ( in_array( $friends[$i]['id'], $invites ) ) {
</del><ins>+ $checked = '';
+
+ if ( !empty( $invites ) ) {
+ if ( in_array( $friends[$i]['id'], $invites ) )
</ins><span class="cx"> $checked = ' checked="checked"';
</span><del>- } else {
- $checked = '';
- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $items[] = '<' . $separator . '><input' . $checked . ' type="checkbox" name="friends[]" id="f-' . $friends[$i]['id'] . '" value="' . esc_attr( $friends[$i]['id'] ) . '" /> ' . $friends[$i]['full_name'] . '</' . $separator . '>';
</span><span class="lines">@@ -2219,7 +2218,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function the_invite() {
</span><del>- global $invite;
</del><ins>+ global $invite, $group_id;
</ins><span class="cx">
</span><span class="cx"> $this->in_the_loop = true;
</span><span class="cx"> $user_id = $this->next_invite();
</span><span class="lines">@@ -2246,8 +2245,10 @@
</span><span class="cx">
</span><span class="cx"> if ( !$group_id ) {
</span><span class="cx"> /* Backwards compatibility */
</span><del>- if ( $bp->groups->current_group ) $group_id = $bp->groups->current_group->id;
- if ( $bp->groups->new_group_id ) $group_id = $bp->groups->new_group_id;
</del><ins>+ if ( !empty( $bp->groups->current_group ) )
+ $group_id = $bp->groups->current_group->id;
+ if ( !empty( $bp->groups->new_group_id ) )
+ $group_id = $bp->groups->new_group_id;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( !$group_id )
</span></span></pre></div>
<a id="trunkbpgroupsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups.php (3554 => 3555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups.php 2010-12-22 00:56:29 UTC (rev 3554)
+++ trunk/bp-groups.php 2010-12-22 01:13:29 UTC (rev 3555)
</span><span class="lines">@@ -535,7 +535,7 @@
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><span class="cx"> if ( $bp->is_single_item ) {
</span><del>- if ( isset($bp->action_variables) && 'send' == $bp->action_variables[0] ) {
</del><ins>+ if ( !empty( $bp->action_variables[0] ) && 'send' == $bp->action_variables[0] ) {
</ins><span class="cx">
</span><span class="cx"> if ( !check_admin_referer( 'groups_send_invites', '_wpnonce_send_invites' ) )
</span><span class="cx"> return false;
</span><span class="lines">@@ -1420,7 +1420,7 @@
</span><span class="cx"> $group_id = $item_id;
</span><span class="cx">
</span><span class="cx"> $group = new BP_Groups_Group( $group_id );
</span><del>- $user_url = bp_core_get_user_domain( $user_id );
</del><ins>+ $user_url = bp_core_get_user_domain( $bp->loggedin_user->id );
</ins><span class="cx">
</span><span class="cx"> if ( (int)$total_items > 1 )
</span><span class="cx"> return apply_filters( 'bp_groups_multiple_group_invite_notification', '<a href="' . $bp->loggedin_user->domain . $bp->groups->slug . '/invites/?n=1" title="' . __( 'Group Invites', 'buddypress' ) . '">' . sprintf( __( 'You have %d new group invitations', 'buddypress' ), (int)$total_items ) . '</a>', $total_items );
</span></span></pre>
</div>
</div>
</body>
</html>