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

Merge branch 'MDL-50880-master' of git://github.com/marinaglancy/moodle

Browse Source
This commit is contained in:
David Monllao
2015-08-20 10:31:20 +08:00
parent 7046798f56 40e501284c
commit 3ac1350598
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
message/lib.php
+4 -4
View File
@@ -977,16 +977,16 @@ function message_format_message_text($message, $forcetexttohtml = false) {
$format = $message->fullmessageformat;
if ($message->smallmessage !== '') {
if (strval($message->smallmessage) !== '') {
if ($message->notification == 1) {
if ($message->fullmessagehtml !== '' or $message->fullmessage !== '') {
if (strval($message->fullmessagehtml) !== '' or strval($message->fullmessage) !== '') {
$format = FORMAT_PLAIN;
}
}
$messagetext = $message->smallmessage;
} else if ($message->fullmessageformat == FORMAT_HTML) {
if ($message->fullmessagehtml !== '') {
if (strval($message->fullmessagehtml) !== '') {
$messagetext = $message->fullmessagehtml;
} else {
$messagetext = $message->fullmessage;
@@ -994,7 +994,7 @@ function message_format_message_text($message, $forcetexttohtml = false) {
}
} else {
if ($message->fullmessage !== '') {
if (strval($message->fullmessage) !== '') {
$messagetext = $message->fullmessage;
} else {
$messagetext = $message->fullmessagehtml;