Merge branch 'MDL-65641' of git://github.com/stronk7/moodle

2019-05-19 10:23:36 +02:00
parent 49f2581ef8 b6c3b130c4
commit 429649efbf
1 changed files with 2 additions and 1 deletions
@@ -737,7 +737,8 @@ $mformpost->set_data(
        'subject' => $post->subject,
        'message' => array(
            'text' => $currenttext,
-            'format' => empty($post->messageformat) ? editors_get_preferred_format() : $post->messageformat,
+            'format' => !isset($post->messageformat) || !is_numeric($post->messageformat) ?
+                editors_get_preferred_format() : $post->messageformat,
            'itemid' => $draftideditor
        ),
        'discussionsubscribe' => $discussionsubscribe,