<!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][11354] trunk: Replace calls to deprecated user query in friends legacy 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/11354">11354</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/11354","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>boonebgorges</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-12-29 02:35:08 +0000 (Thu, 29 Dec 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 calls to deprecated user query in friends legacy functions.
Props tw2113.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/6889">#6889</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpfriendsbpfriendsfunctionsphp">trunk/src/bp-friends/bp-friends-functions.php</a></li>
<li><a href="#trunktestsphpunittestcasesfriendsfunctionsphp">trunk/tests/phpunit/testcases/friends/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpfriendsbpfriendsfunctionsphp"></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/bp-friends-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-friends/bp-friends-functions.php 2016-12-29 02:27:13 UTC (rev 11353)
+++ trunk/src/bp-friends/bp-friends-functions.php 2016-12-29 02:35:08 UTC (rev 11354)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -421,18 +421,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array See {@link BP_Core_User::get_users()}.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function friends_get_recently_active( $user_id, $per_page = 0, $page = 0, $filter = '' ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $friends = bp_core_get_users( array(
+ 'type' => 'active',
+ 'per_page' => $per_page,
+ 'page' => $page,
+ 'user_id' => $user_id,
+ 'search_terms' => $filter,
+ ) );
</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"> * Filters a user's most recently active friends.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.2.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param array {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $friends {
</ins><span class="cx" style="display: block; padding: 0 10px"> * @type int $total_users Total number of users matched by query params.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type array $paged_users The current page of users matched by query params.
</span><span class="cx" style="display: block; padding: 0 10px"> * }
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return apply_filters( 'friends_get_recently_active', BP_Core_User::get_users( 'active', $per_page, $page, $user_id, $filter ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return apply_filters( 'friends_get_recently_active', $friends );
</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"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -452,18 +459,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array See {@link BP_Core_User::get_users()}.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function friends_get_alphabetically( $user_id, $per_page = 0, $page = 0, $filter = '' ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $friends = bp_core_get_users( array(
+ 'type' => 'alphabetical',
+ 'per_page' => $per_page,
+ 'page' => $page,
+ 'user_id' => $user_id,
+ 'search_terms' => $filter,
+ ) );
</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"> * Filters a user's friends listed in alphabetical order.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.2.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return array {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return array $friends {
</ins><span class="cx" style="display: block; padding: 0 10px"> * @type int $total_users Total number of users matched by query params.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type array $paged_users The current page of users matched by query params.
</span><span class="cx" style="display: block; padding: 0 10px"> * }
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return apply_filters( 'friends_get_alphabetically', BP_Core_User::get_users( 'alphabetical', $per_page, $page, $user_id, $filter ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return apply_filters( 'friends_get_alphabetically', $friends );
</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"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -483,18 +497,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array See {@link BP_Core_User::get_users()}.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function friends_get_newest( $user_id, $per_page = 0, $page = 0, $filter = '' ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $friends = bp_core_get_users( array(
+ 'type' => 'newest',
+ 'per_page' => $per_page,
+ 'page' => $page,
+ 'user_id' => $user_id,
+ 'search_terms' => $filter,
+ ) );
</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"> * Filters a user's friends listed from newest to oldest.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.2.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param array {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $friends {
</ins><span class="cx" style="display: block; padding: 0 10px"> * @type int $total_users Total number of users matched by query params.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type array $paged_users The current page of users matched by query params.
</span><span class="cx" style="display: block; padding: 0 10px"> * }
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return apply_filters( 'friends_get_newest', BP_Core_User::get_users( 'newest', $per_page, $page, $user_id, $filter ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return apply_filters( 'friends_get_newest', $friends );
</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"> /**
</span></span></pre></div>
<a id="trunktestsphpunittestcasesfriendsfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/testcases/friends/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/friends/functions.php 2016-12-29 02:27:13 UTC (rev 11353)
+++ trunk/tests/phpunit/testcases/friends/functions.php 2016-12-29 02:35:08 UTC (rev 11354)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -334,7 +334,6 @@
</span><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"> public function test_friends_get_recently_active() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->setExpectedDeprecated( 'BP_Core_User::get_users' );
</del><span class="cx" style="display: block; padding: 0 10px"> $u1 = $this->factory->user->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $u2 = $this->factory->user->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $u3 = $this->factory->user->create();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -357,7 +356,6 @@
</span><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"> public function test_friends_get_alphabetically() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->setExpectedDeprecated( 'BP_Core_User::get_users' );
</del><span class="cx" style="display: block; padding: 0 10px"> $u1 = $this->factory->user->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $u2 = $this->factory->user->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $u3 = $this->factory->user->create();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -369,6 +367,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $field_id = bp_xprofile_fullname_field_id();
</span><span class="cx" style="display: block; padding: 0 10px"> xprofile_set_field_data( $field_id, $u2, 'Dave Lister' );
</span><span class="cx" style="display: block; padding: 0 10px"> xprofile_set_field_data( $field_id, $u3, 'Arnold Rimmer' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ xprofile_sync_wp_profile( $u2 );
+ xprofile_sync_wp_profile( $u3 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $alpha = friends_get_alphabetically( $u1 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -377,7 +377,6 @@
</span><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"> public function test_friends_get_newest() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->setExpectedDeprecated( 'BP_Core_User::get_users' );
</del><span class="cx" style="display: block; padding: 0 10px"> $u1 = $this->factory->user->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $u2 = $this->factory->user->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $u3 = $this->factory->user->create();
</span></span></pre>
</div>
</div>
</body>
</html>