moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-07 09:56:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-50806-master' of git://github.com/merrill-oakland/moodle

Browse source
This commit is contained in:
Dan Poltawski 2015-07-13 13:42:53 +01:00
commit 5fceb11e6c
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
question/format.php
View file

@ -289,8 +289,9 @@ class qformat_default {
public function importprocess($category) { public function importprocess($category) {
global $USER, $CFG, $DB, $OUTPUT; global $USER, $CFG, $DB, $OUTPUT;
// reset the timer in case file upload was slow // Raise time and memory, as importing can be quite intensive.
core_php_time_limit::raise(); core_php_time_limit::raise();
raise_memory_limit(MEMORY_EXTRA);
// STAGE 1: Parse the file // STAGE 1: Parse the file
echo $OUTPUT->notification(get_string('parsingquestions', 'question'), 'notifysuccess'); echo $OUTPUT->notification(get_string('parsingquestions', 'question'), 'notifysuccess');