From 9a2938c57ce36d4e381273ff9f6a5ef8ec44c16b Mon Sep 17 00:00:00 2001 From: Eric Merrill Date: Thu, 29 May 2014 11:30:23 -0400 Subject: [PATCH] MDL-45761 assign Set inline comment format properly when plugin is empty If a plugin says it is empty, skip it for for building the inline comment. If not format was found in any plugins, set to FORMAT_HTML, which is the default for feedback anyways. --- mod/assign/feedback/comments/locallib.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mod/assign/feedback/comments/locallib.php b/mod/assign/feedback/comments/locallib.php index e0ea32e42ab..e308bcb056f 100644 --- a/mod/assign/feedback/comments/locallib.php +++ b/mod/assign/feedback/comments/locallib.php @@ -236,7 +236,7 @@ class assign_feedback_comments extends assign_feedback_plugin { foreach ($this->assignment->get_submission_plugins() as $plugin) { $fields = $plugin->get_editor_fields(); - if ($plugin->is_enabled() && $plugin->is_visible() && !empty($fields)) { + if ($plugin->is_enabled() && $plugin->is_visible() && !$plugin->is_empty($submission) && !empty($fields)) { foreach ($fields as $key => $description) { $rawtext = strip_pluginfile_content($plugin->get_editor_text($key, $submission->id)); @@ -253,8 +253,12 @@ class assign_feedback_comments extends assign_feedback_plugin { } } + if ($format === false) { + $format = FORMAT_HTML; + } $data->assignfeedbackcomments_editor['text'] = $text; $data->assignfeedbackcomments_editor['format'] = $format; + return true; }