<!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][10820] trunk/src: Replace group membership static DB method calls with group membership functions.</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://buddypress.trac.wordpress.org/changeset/10820">10820</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/10820","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>r-a-y</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-05-28 21:17:35 +0000 (Sat, 28 May 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Replace group membership static DB method calls with group membership functions.
Our group membership functions now have better caching logic due to <a href="http://buddypress.trac.wordpress.org/ticket/6327">#6327</a>
and <a href="http://buddypress.trac.wordpress.org/ticket/7078">#7078</a>.
This commit switches all our older group membership static DB method calls
with these group membership functions so sites enabled with an object cache
can benefit from these improvements.
Props r-a-y, boonebgorges, dcavins.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/7078">#7078</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpfriendsclassesclassbpfriendsfriendshipphp">trunk/src/bp-friends/classes/class-bp-friends-friendship.php</a></li>
<li><a href="#trunksrcbpgroupsbpgroupsscreensphp">trunk/src/bp-groups/bp-groups-screens.php</a></li>
<li><a href="#trunksrcbpgroupsclassesclassbpgroupsgroupphp">trunk/src/bp-groups/classes/class-bp-groups-group.php</a></li>
<li><a href="#trunksrcbptemplatesbplegacybuddypressfunctionsphp">trunk/src/bp-templates/bp-legacy/buddypress-functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpfriendsclassesclassbpfriendsfriendshipphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-friends/classes/class-bp-friends-friendship.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-friends/classes/class-bp-friends-friendship.php 2016-05-28 21:02:10 UTC (rev 10819)
+++ trunk/src/bp-friends/classes/class-bp-friends-friendship.php 2016-05-28 21:17:35 UTC (rev 10820)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -655,6 +655,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * - users who have been banned from the group
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.0.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @todo Need to do a group component check before using group functions.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $user_id ID of the user whose friends are being counted.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $group_id ID of the group friends are being invited to.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -663,23 +664,26 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public static function get_invitable_friend_count( $user_id, $group_id ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Setup some data we'll use below.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $is_group_admin = BP_Groups_Member::check_is_admin( $user_id, $group_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $is_group_admin = groups_is_user_admin( $user_id, $group_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> $friend_ids = BP_Friends_Friendship::get_friend_user_ids( $user_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $invitable_count = 0;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> for ( $i = 0, $count = count( $friend_ids ); $i < $count; ++$i ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If already a member, they cannot be invited again.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( BP_Groups_Member::check_is_member( (int) $friend_ids[$i], $group_id ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( groups_is_user_member( (int) $friend_ids[$i], $group_id ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If user already has invite, they cannot be added.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( BP_Groups_Member::check_has_invite( (int) $friend_ids[$i], $group_id ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( groups_check_user_has_invite( (int) $friend_ids[$i], $group_id ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If user is not group admin and friend is banned, they cannot be invited.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ( false === $is_group_admin ) && BP_Groups_Member::check_is_banned( (int) $friend_ids[$i], $group_id ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ( false === $is_group_admin ) && groups_is_user_banned( (int) $friend_ids[$i], $group_id ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $invitable_count++;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcbpgroupsbpgroupsscreensphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-groups/bp-groups-screens.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-groups/bp-groups-screens.php 2016-05-28 21:02:10 UTC (rev 10819)
+++ trunk/src/bp-groups/bp-groups-screens.php 2016-05-28 21:17:35 UTC (rev 10820)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -690,7 +690,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! bp_groups_user_can_send_invites( $group_id ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $message = __( 'You are not allowed to send or remove invites', 'buddypress' );
</span><span class="cx" style="display: block; padding: 0 10px"> $error = 'error';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( BP_Groups_Member::check_for_membership_request( $friend_id, $group_id ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( groups_check_for_membership_request( $friend_id, $group_id ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $message = __( 'The member requested to join the group', 'buddypress' );
</span><span class="cx" style="display: block; padding: 0 10px"> $error = 'error';
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! groups_uninvite_user( $friend_id, $group_id ) ) {
</span></span></pre></div>
<a id="trunksrcbpgroupsclassesclassbpgroupsgroupphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-groups/classes/class-bp-groups-group.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-groups/classes/class-bp-groups-group.php 2016-05-28 21:02:10 UTC (rev 10819)
+++ trunk/src/bp-groups/classes/class-bp-groups-group.php 2016-05-28 21:17:35 UTC (rev 10820)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -245,9 +245,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Set user-specific data.
</span><span class="cx" style="display: block; padding: 0 10px"> $user_id = bp_loggedin_user_id();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->is_member = BP_Groups_Member::check_is_member( $user_id, $this->id );
- $this->is_invited = BP_Groups_Member::check_has_invite( $user_id, $this->id );
- $this->is_pending = BP_Groups_Member::check_for_membership_request( $user_id, $this->id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->is_member = groups_is_user_member( $user_id, $this->id );
+ $this->is_invited = groups_check_user_has_invite( $user_id, $this->id );
+ $this->is_pending = groups_check_for_membership_request( $user_id, $this->id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If this is a private or hidden group, does the current user have access?
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ( 'private' === $this->status ) || ( 'hidden' === $this->status ) ) {
</span></span></pre></div>
<a id="trunksrcbptemplatesbplegacybuddypressfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-templates/bp-legacy/buddypress-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-legacy/buddypress-functions.php 2016-05-28 21:02:10 UTC (rev 10819)
+++ trunk/src/bp-templates/bp-legacy/buddypress-functions.php 2016-05-28 21:17:35 UTC (rev 10820)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1278,7 +1278,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Users who have previously requested membership do not need
</span><span class="cx" style="display: block; padding: 0 10px"> // another invitation created for them.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( BP_Groups_Member::check_for_membership_request( $friend_id, $group_id ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( groups_check_for_membership_request( $friend_id, $group_id ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $user_status = 'is_pending';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Create the user invitation.
</span></span></pre>
</div>
</div>
</body>
</html>