From 9dbe0313ce31969493f542305a1d7d92dcccd730 Mon Sep 17 00:00:00 2001 From: Rajesh Taneja Date: Wed, 9 Oct 2013 16:37:01 +0800 Subject: [PATCH] MDL-42222 Assignment: Added type check before checking mimetype Online submission type pass string in files, so added check to see if file is of type stored_file then check mimetype --- mod/assign/feedback/editpdf/classes/document_services.php | 2 +- mod/assign/feedback/editpdf/tests/editpdf_test.php | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mod/assign/feedback/editpdf/classes/document_services.php b/mod/assign/feedback/editpdf/classes/document_services.php index e9562082e9a..9fe930a511b 100644 --- a/mod/assign/feedback/editpdf/classes/document_services.php +++ b/mod/assign/feedback/editpdf/classes/document_services.php @@ -117,7 +117,7 @@ class document_services { if ($plugin->is_enabled() && $plugin->is_visible()) { $pluginfiles = $plugin->get_files($submission, $user); foreach ($pluginfiles as $filename => $file) { - if ($file->get_mimetype() === 'application/pdf') { + if (($file instanceof \stored_file) && ($file->get_mimetype() === 'application/pdf')) { $files[$filename] = $file; } } diff --git a/mod/assign/feedback/editpdf/tests/editpdf_test.php b/mod/assign/feedback/editpdf/tests/editpdf_test.php index 1e64c5e740a..6afe93ffa8b 100644 --- a/mod/assign/feedback/editpdf/tests/editpdf_test.php +++ b/mod/assign/feedback/editpdf/tests/editpdf_test.php @@ -54,7 +54,8 @@ class assignfeedback_editpdf_testcase extends mod_assign_base_testcase { protected function create_assign_and_submit_pdf() { global $CFG; - $assign = $this->create_instance(array('assignsubmission_file_enabled' => 1, + $assign = $this->create_instance(array('assignsubmission_onlinetext_enabled' => 1, + 'assignsubmission_file_enabled' => 1, 'assignsubmission_file_maxfiles' => 1, 'assignfeedback_editpdf_enabled' => 1, 'assignsubmission_file_maxsizebytes' => 1000000));