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.
This commit is contained in:
Eric Merrill
2014-06-05 08:58:09 -04:00
parent d73b1f3e71
commit 9a2938c57c
+5 -1
View File
@@ -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;
}