L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-45761-master' of https://github.com/merrill-oakland/moodle

Browse Source
This commit is contained in:
Damyon Wiese
2014-06-10 14:01:23 +08:00
parent dc92753a3a 98f52b7dc0
commit 850833378d
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/assign/feedback/comments/locallib.php
+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;
}