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

Merge branch 'MDL-68265-37' of git://github.com/andrewnicols/moodle into MOODLE_37_STABLE

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2020-04-01 23:29:31 +02:00
parent da231a51e0 94ec80ae18
commit 5bfbbb34be
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/lesson/import.php
+1 -3
View File
@@ -66,9 +66,7 @@ if ($data = $mform->get_data()) {
require_sesskey();
$realfilename = $mform->get_new_filename('questionfile');
//TODO: Leave all imported questions in Questionimport for now.
$importfile = "{$CFG->tempdir}/questionimport/{$realfilename}";
make_temp_directory('questionimport');
$importfile = make_request_directory() . "/{$realfilename}";
if (!$result = $mform->save_file('questionfile', $importfile, true)) {
throw new moodle_exception('uploadproblem');
}
question/import.php
+1 -3
View File
@@ -86,9 +86,7 @@ if ($form = $import_form->get_data()) {
// work out if this is an uploaded file
// or one from the filesarea.
$realfilename = $import_form->get_new_filename('newfile');
$importfile = "{$CFG->tempdir}/questionimport/{$realfilename}";
make_temp_directory('questionimport');
$importfile = make_request_directory() . "/{$realfilename}";
if (!$result = $import_form->save_file('newfile', $importfile, true)) {
throw new moodle_exception('uploadproblem');
}