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

Merge branch 'MDL-66136-master' of git://github.com/mihailges/moodle

Browse Source
This commit is contained in:
Adrian Greeve
2019-07-22 10:40:30 +08:00
parent de2976e548 b7e4229187
commit 70f1d11338
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/assign/submission/onlinetext/locallib.php
+12 -2
View File
@@ -599,12 +599,17 @@ class assign_submission_onlinetext extends assign_submission_plugin {
public function is_empty(stdClass $submission) {
$onlinetextsubmission = $this->get_onlinetext_submission($submission->id);
$wordcount = 0;
$hasinsertedresources = false;
if (isset($onlinetextsubmission->onlinetext)) {
$wordcount = count_words(trim($onlinetextsubmission->onlinetext));
// Check if the online text submission contains video, audio or image elements
// that can be ignored and stripped by count_words().
$hasinsertedresources = preg_match('/<\s*((video|audio)[^>]*>(.*?)<\s*\/\s*(video|audio)>)|(img[^>]*>(.*?))/',
trim($onlinetextsubmission->onlinetext));
}
return $wordcount == 0;
return $wordcount == 0 && !$hasinsertedresources;
}
/**
@@ -621,12 +626,17 @@ class assign_submission_onlinetext extends assign_submission_plugin {
return true;
}
$wordcount = 0;
$hasinsertedresources = false;
if (isset($data->onlinetext_editor['text'])) {
$wordcount = count_words(trim((string)$data->onlinetext_editor['text']));
// Check if the online text submission contains video, audio or image elements
// that can be ignored and stripped by count_words().
$hasinsertedresources = preg_match('/<\s*((video|audio)[^>]*>(.*?)<\s*\/\s*(video|audio)>)|(img[^>]*>(.*?))/',
trim((string)$data->onlinetext_editor['text']));
}
return $wordcount == 0;
return $wordcount == 0 && !$hasinsertedresources;
}
/**
mod/assign/submission/onlinetext/tests/locallib_test.php
+4 -1
View File
@@ -103,7 +103,10 @@ class assignsubmission_onlinetext_locallib_testcase extends advanced_testcase {
'Empty submission null' => [null, true],
'Value 0' => [0, false],
'String 0' => ['0', false],
'Text' => ['Ai! laurië lantar lassi súrinen, yéni únótimë ve rámar aldaron!', false]
'Text' => ['Ai! laurië lantar lassi súrinen, yéni únótimë ve rámar aldaron!', false],
'Image' => ['<img src="test.jpg" />', false],
'Video' => ['<video controls="true"><source src="test.mp4"></video>', false],
'Audio' => ['<audio controls="true"><source src="test.mp3"></audio>', false],
];
}
}