mirror of
https://github.com/moodle/moodle.git
synced 2025-04-20 16:04:25 +02:00
Merge branch 'MDL-65605-master' of git://github.com/rezaies/moodle
This commit is contained in:
commit
c13d1d2518
@ -59,6 +59,7 @@ class lesson_import_form extends moodleform {
|
||||
* @param array $data the submitted data.
|
||||
* @param array $errors the errors so far.
|
||||
* @return array the updated errors.
|
||||
* @throws moodle_exception
|
||||
*/
|
||||
protected function validate_uploaded_file($data, $errors) {
|
||||
global $CFG;
|
||||
@ -69,7 +70,7 @@ class lesson_import_form extends moodleform {
|
||||
}
|
||||
|
||||
$files = $this->get_draft_files('questionfile');
|
||||
if (count($files) < 1) {
|
||||
if (!is_array($files) || count($files) < 1) {
|
||||
$errors['questionfile'] = get_string('required');
|
||||
return $errors;
|
||||
}
|
||||
|
@ -112,6 +112,7 @@ class question_import_form extends moodleform {
|
||||
* @param array $data the submitted data.
|
||||
* @param array $errors the errors so far.
|
||||
* @return array the updated errors.
|
||||
* @throws moodle_exception
|
||||
*/
|
||||
protected function validate_uploaded_file($data, $errors) {
|
||||
if (empty($data['newfile'])) {
|
||||
@ -120,7 +121,7 @@ class question_import_form extends moodleform {
|
||||
}
|
||||
|
||||
$files = $this->get_draft_files('newfile');
|
||||
if (count($files) < 1) {
|
||||
if (!is_array($files) || count($files) < 1) {
|
||||
$errors['newfile'] = get_string('required');
|
||||
return $errors;
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user