moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 08:56:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-50880 message: correctly compare with empty string

Browse source 
Thanks to David Herney Bernal for providing a fix
This commit is contained in:
Marina Glancy 2015-08-19 16:01:42 +08:00
parent dda862abb5
commit 40e501284c
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
message/lib.php
View file

@ -977,16 +977,16 @@ function message_format_message_text($message, $forcetexttohtml = false) {
$format = $message->fullmessageformat; $format = $message->fullmessageformat;
if ($message->smallmessage !== '') { if (strval($message->smallmessage) !== '') {
if ($message->notification == 1) { if ($message->notification == 1) {
if ($message->fullmessagehtml !== '' or $message->fullmessage !== '') { if (strval($message->fullmessagehtml) !== '' or strval($message->fullmessage) !== '') {
$format = FORMAT_PLAIN; $format = FORMAT_PLAIN;
} }
} }
$messagetext = $message->smallmessage; $messagetext = $message->smallmessage;
} else if ($message->fullmessageformat == FORMAT_HTML) { } else if ($message->fullmessageformat == FORMAT_HTML) {
if ($message->fullmessagehtml !== '') { if (strval($message->fullmessagehtml) !== '') {
$messagetext = $message->fullmessagehtml; $messagetext = $message->fullmessagehtml;
} else { } else {
$messagetext = $message->fullmessage; $messagetext = $message->fullmessage;
@ -994,7 +994,7 @@ function message_format_message_text($message, $forcetexttohtml = false) {
} }
} else { } else {
if ($message->fullmessage !== '') { if (strval($message->fullmessage) !== '') {
$messagetext = $message->fullmessage; $messagetext = $message->fullmessage;
} else { } else {
$messagetext = $message->fullmessagehtml; $messagetext = $message->fullmessagehtml;