Merge branch 'MDL-62643-master' of git://github.com/damyon/moodle

This commit is contained in:
Andrew Nicols 2018-08-14 09:04:17 +08:00
commit bc51085174

View File

@ -395,7 +395,9 @@ class assign_submission_onlinetext extends assign_submission_plugin {
$files = array();
$onlinetextsubmission = $this->get_onlinetext_submission($submission->id);
if ($onlinetextsubmission) {
// Note that this check is the same logic as the result from the is_empty function but we do
// not call it directly because we already have the submission record.
if ($onlinetextsubmission && !empty($onlinetextsubmission->onlinetext)) {
$finaltext = $this->assignment->download_rewrite_pluginfile_urls($onlinetextsubmission->onlinetext, $user, $this);
$formattedtext = format_text($finaltext,
$onlinetextsubmission->onlineformat,