Permalink
Browse files

Merge branch 'MDL-42411-master' of git://github.com/damyon/moodle

  • Loading branch information...
danpoltawski committed Oct 17, 2013
2 parents 059d7bd + 5d5c4c0 commit c68bf34f83b024570127306ba049d47c9c215dd9
Showing with 2 additions and 0 deletions.
  1. +2 −0 backup/controller/restore_controller.class.php
@@ -422,6 +422,7 @@ public function convert() {
// Basic/initial prevention against time/memory limits
set_time_limit(1 * 60 * 60); // 1 hour for 1 course initially granted
raise_memory_limit(MEMORY_EXTRA);
$this->progress->start_progress('Backup format conversion');
if ($this->status != backup::STATUS_REQUIRE_CONV) {
throw new restore_controller_exception('cannot_convert_not_required_status');
@@ -452,6 +453,7 @@ public function convert() {
} else {
$this->set_status(backup::STATUS_NEED_PRECHECK);
}
$this->progress->end_progress();
}
// Protected API starts here

0 comments on commit c68bf34

Please sign in to comment.