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

BenKelada · Aug 20, 2015 · 3ac1350 · 3ac1350
2 parents 7046798 + 40e5012
commit 3ac1350
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/message/lib.php b/message/lib.php
@@ -977,24 +977,24 @@ 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;
             $format = FORMAT_MOODLE;
         }
 
     } else {
-        if ($message->fullmessage !== '') {
+        if (strval($message->fullmessage) !== '') {
             $messagetext = $message->fullmessage;
         } else {
             $messagetext = $message->fullmessagehtml;