mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-22 00:42:54 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-30022_message_duplicate' of git://github.com/andyjdavis/moodle

Browse Source
This commit is contained in:
Sam Hemelryk 2012-09-04 16:50:36 +12:00
commit b5b82ae943
1 changed files with 11 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
message/lib.php
View File

@ -749,29 +749,15 @@ function message_get_recent_conversations($user, $limitfrom=0, $limitto=100) {
}
}
//Sort the conversations. This is a bit complicated as we need to sort by $conversation->timecreated
//and there may be multiple conversations with the same timecreated value.
//The conversations array contains both read and unread messages (different tables) so sorting by ID won't work
usort($conversations, "conversationsort");
// Sort the conversations by $conversation->timecreated, newest to oldest
// There may be multiple conversations with the same timecreated
// The conversations array contains both read and unread messages (different tables) so sorting by ID won't work
$result = collatorlib::asort_objects_by_property($conversations, 'timecreated', collatorlib::SORT_NUMERIC);
$conversations = array_reverse($conversations);
return $conversations;
}
/**
* Sort function used to order conversations
*
* @param object $a A conversation object
* @param object $b A conversation object
* @return integer
*/
function conversationsort($a, $b)
{
if ($a->timecreated == $b->timecreated) {
return 0;
}
return ($a->timecreated > $b->timecreated) ? -1 : 1;
}
/**
* Get the users recent event notifications
*
@ -1805,7 +1791,7 @@ function message_get_history($user1, $user2, $limitnum=0, $viewingnewmessages=fa
array($user1->id, $user2->id, $user2->id, $user1->id, $user1->id),
"timecreated $sort", '*', 0, $limitnum)) {
foreach ($messages_read as $message) {
$messages[$message->timecreated] = $message;
$messages[] = $message;
}
}
if ($messages_new = $DB->get_records_select('message', "((useridto = ? AND useridfrom = ?) OR
@ -1813,15 +1799,16 @@ function message_get_history($user1, $user2, $limitnum=0, $viewingnewmessages=fa
array($user1->id, $user2->id, $user2->id, $user1->id, $user1->id),
"timecreated $sort", '*', 0, $limitnum)) {
foreach ($messages_new as $message) {
$messages[$message->timecreated] = $message;
$messages[] = $message;
}
}
$result = collatorlib::asort_objects_by_property($messages, 'timecreated', collatorlib::SORT_NUMERIC);
//if we only want the last $limitnum messages
ksort($messages);
$messagecount = count($messages);
if ($limitnum>0 && $messagecount>$limitnum) {
$messages = array_slice($messages, $messagecount-$limitnum, $limitnum, true);
if ($limitnum > 0 && $messagecount > $limitnum) {
$messages = array_slice($messages, $messagecount - $limitnum, $limitnum, true);
}
return $messages;