L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-64412 core_message: remove ordering code from message_search_users()

Browse Source 
This code is no longer needed as get_member_info() now respects the
ordering of the $userids param.
This commit is contained in:
Jake Dallimore
2019-01-02 15:21:39 +08:00
parent bed5aa4d13
commit 61bdf6fab3
1 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
message/classes/api.php
+7 -15
View File
@@ -323,15 +323,11 @@ class api {
ORDER BY " . $DB->sql_fullname();
$foundusers = $DB->get_records_sql_menu($sql, $params + $excludeparams, $limitfrom, $limitnum);
$orderedcontacts = array();
$contacts = [];
if (!empty($foundusers)) {
$contacts = helper::get_member_info($userid, array_keys($foundusers));
// The get_member_info returns an associative array, so is not ordered in the same way.
// We need to reorder it again based on query's result.
foreach ($foundusers as $key => $value) {
$contact = $contacts[$key];
$contact->conversations = self::get_conversations_between_users($userid, $key, 0, 1000);
$orderedcontacts[] = $contact;
foreach ($contacts as $memberuserid => $memberinfo) {
$contacts[$memberuserid]->conversations = self::get_conversations_between_users($userid, $memberuserid, 0, 1000);
}
}
@@ -417,19 +413,15 @@ class api {
$foundusers = $returnedusers;
}
$orderednoncontacts = array();
$noncontacts = [];
if (!empty($foundusers)) {
$noncontacts = helper::get_member_info($userid, array_keys($foundusers));
// The get_member_info returns an associative array, so is not ordered in the same way.
// We need to reorder it again based on query's result.
foreach ($foundusers as $key => $value) {
$contact = $noncontacts[$key];
$contact->conversations = self::get_conversations_between_users($userid, $key, 0, 1000);
$orderednoncontacts[] = $contact;
foreach ($noncontacts as $memberuserid => $memberinfo) {
$noncontacts[$memberuserid]->conversations = self::get_conversations_between_users($userid, $memberuserid, 0, 1000);
}
}
return array($orderedcontacts, $orderednoncontacts);
return array(array_values($contacts), array_values($noncontacts));
}
/**