<!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][13079] branches/9.0: Limit orderby values in BP_Invitation.</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 { white-space: pre-line; 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/13079">13079</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/13079","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dcavins</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2021-08-17 23:13:43 +0000 (Tue, 17 Aug 2021)</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'>Limit orderby values in BP_Invitation.
Ensure that passed orderby value matches a
verified database column name.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches90srcbpcoreclassesclassbpinvitationphp">branches/9.0/src/bp-core/classes/class-bp-invitation.php</a></li>
<li><a href="#branches90testsphpunittestcasescoreinvitationsphp">branches/9.0/tests/phpunit/testcases/core/invitations.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches90srcbpcoreclassesclassbpinvitationphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/9.0/src/bp-core/classes/class-bp-invitation.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/9.0/src/bp-core/classes/class-bp-invitation.php 2021-08-17 23:05:26 UTC (rev 13078)
+++ branches/9.0/src/bp-core/classes/class-bp-invitation.php 2021-08-17 23:13:43 UTC (rev 13079)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -131,6 +131,28 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public $accepted;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Columns in the invitations table.
+ *
+ * @since 9.0.0
+ * @access public
+ * @var array
+ */
+ public static $columns = array(
+ 'id',
+ 'user_id',
+ 'inviter_id',
+ 'invitee_email',
+ 'class',
+ 'item_id',
+ 'secondary_item_id',
+ 'type',
+ 'content',
+ 'date_modified',
+ 'invite_sent',
+ 'accepted'
+ );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /** Public Methods ****************************************************/
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -473,8 +495,16 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Order by.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $args['order_by'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $order_by = implode( ', ', (array) $args['order_by'] );
- $conditions['order_by'] = "{$order_by}";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $order_by_clean = array();
+ foreach ( (array) $args['order_by'] as $key => $value ) {
+ if ( in_array( $value, self::$columns, true ) ) {
+ $order_by_clean[] = $value;
+ }
+ }
+ if ( ! empty( $order_by_clean ) ) {
+ $order_by = implode( ', ', $order_by_clean );
+ $conditions['order_by'] = "{$order_by}";
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Sort order direction.
</span></span></pre></div>
<a id="branches90testsphpunittestcasescoreinvitationsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/9.0/tests/phpunit/testcases/core/invitations.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/9.0/tests/phpunit/testcases/core/invitations.php 2021-08-17 23:05:26 UTC (rev 13078)
+++ branches/9.0/tests/phpunit/testcases/core/invitations.php 2021-08-17 23:13:43 UTC (rev 13079)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -381,4 +381,54 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_current_user( $old_current_user );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_bp_invitations_orderby_item_id() {
+ $old_current_user = get_current_user_id();
+
+ $u1 = $this->factory->user->create();
+ $u2 = $this->factory->user->create();
+ $u3 = $this->factory->user->create();
+ $this->set_current_user( $u1 );
+
+ $invites_class = new BPTest_Invitation_Manager_Extension();
+
+ // Create an invitation.
+ $i1_args = array(
+ 'user_id' => $u2,
+ 'inviter_id' => $u1,
+ 'item_id' => 6,
+ );
+ $i1 = $invites_class->add_invitation( $i1_args );
+ $invites_class->send_invitation_by_id( $i1 );
+
+ $i2_args = array(
+ 'user_id' => $u3,
+ 'inviter_id' => $u1,
+ 'item_id' => 4,
+ );
+ $i2 = $invites_class->add_invitation( $i2_args );
+ $invites_class->send_invitation_by_id( $i2 );
+
+ $i3_args = array(
+ 'user_id' => $u2,
+ 'inviter_id' => $u1,
+ 'item_id' => 8,
+ );
+ $i3 = $invites_class->add_invitation( $i3_args );
+ $invites_class->send_invitation_by_id( $i3 );
+
+ $get_invites = array(
+ 'order_by' => 'item_id',
+ 'sort_order' => 'ASC',
+ 'fields' => 'ids',
+ );
+ $invites = $invites_class->get_invitations( $get_invites );
+ $this->assertEquals( array( $i2, $i1, $i3 ), $invites );
+
+ $get_invites['sort_order'] = 'DESC';
+ $invites = $invites_class->get_invitations( $get_invites );
+ $this->assertEquals( array( $i3, $i1, $i2 ), $invites );
+
+ $this->set_current_user( $old_current_user );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>