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

message MDL-25240 made filters work when displaying messages

Browse Source
This commit is contained in:
Andrew Davis
2010-11-17 06:36:26 +00:00
parent affefa8cc3
commit 2846b9a6a2
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
message/lib.php
+5 -4
View File
@@ -1417,9 +1417,10 @@ function message_get_history($user1, $user2, $limitnum=0, $viewingnewmessages=fa
}
//if we only want the last $limitnum messages
if ($limitnum>0) {
ksort($messages);
$messages = array_slice($messages, count($messages)-$limitnum, $limitnum, true);
ksort($messages);
$messagecount = count($messages);
if ($limitnum>0 && $messagecount>$limitnum) {
$messages = array_slice($messages, $messagecount-$limitnum, $limitnum, true);
}
return $messages;
@@ -1520,7 +1521,7 @@ function message_format_message(&$message, &$user, $format='', $keywords='', $cl
//if supplied display small messages as fullmessage may contain boilerplate text that shouldnt appear in the messaging UI
if (!empty($message->smallmessage)) {
$messagetext = format_text($message->smallmessage, null, $options);
$messagetext = format_text($message->smallmessage, FORMAT_MOODLE, $options);
} else {
$messagetext = format_text($message->fullmessage, $message->fullmessageformat, $options);
}