From a01edef5be3f21f4f3816c01725d20a04e5c4b64 Mon Sep 17 00:00:00 2001
From: Shamim Rezaie <shamim@moodle.com>
Date: Wed, 15 May 2019 17:47:50 +1000
Subject: [PATCH 1/2] MDL-65605 mod_lesson: Fix the issue when get_draft_files
 returns null

---
 mod/lesson/import_form.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mod/lesson/import_form.php b/mod/lesson/import_form.php
index b152c0abe24..0ca0b1e5d68 100644
--- a/mod/lesson/import_form.php
+++ b/mod/lesson/import_form.php
@@ -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;
         }

From 159f904af579f66f205d2e45ab260d18209a4be4 Mon Sep 17 00:00:00 2001
From: Shamim Rezaie <shamim@moodle.com>
Date: Wed, 15 May 2019 17:52:17 +1000
Subject: [PATCH 2/2] MDL-65605 core_question: Fix the issue when
 get_draft_files returns nul

---
 question/import_form.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/question/import_form.php b/question/import_form.php
index ad2cc18feb6..f4693e40184 100644
--- a/question/import_form.php
+++ b/question/import_form.php
@@ -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;
         }