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

MDL-64310 backup: allow session to be released during backup/restore

Browse Source 
Amended to fix a wrong call to backup_controller() constructor,
originally not passing USER->id
This commit is contained in:
Rossco Hellmans
2020-01-14 23:54:42 +01:00
committed by Eloy Lafuente (stronk7)
parent 8d529d0a2d
commit 383b0f95ab
6 changed files with 36 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backup/controller/backup_controller.class.php
+8 -1
View File
@@ -79,8 +79,9 @@ class backup_controller extends base_controller {
* @param bool $interactive Whether this backup will require user interaction; backup::INTERACTIVE_YES or INTERACTIVE_NO
* @param int $mode One of backup::MODE_GENERAL, MODE_IMPORT, MODE_SAMESITE, MODE_HUB, MODE_AUTOMATED
* @param int $userid The id of the user making the backup
* @param bool $releasesession Should release the session? backup::RELEASESESSION_YES or backup::RELEASESESSION_NO
*/
public function __construct($type, $id, $format, $interactive, $mode, $userid){
public function __construct($type, $id, $format, $interactive, $mode, $userid, $releasesession = backup::RELEASESESSION_NO) {
$this->type = $type;
$this->id = $id;
$this->courseid = backup_controller_dbops::get_courseid_from_type_id($this->type, $this->id);
@@ -88,6 +89,7 @@ class backup_controller extends base_controller {
$this->interactive = $interactive;
$this->mode = $mode;
$this->userid = $userid;
$this->releasesession = $releasesession;
// Apply some defaults
$this->operation = backup::OPERATION_BACKUP;
@@ -359,6 +361,11 @@ class backup_controller extends base_controller {
core_php_time_limit::raise(1 * 60 * 60); // 1 hour for 1 course initially granted
raise_memory_limit(MEMORY_EXTRA);
// Release the session so other tabs in the same session are not blocked.
if ($this->get_releasesession() === backup::RELEASESESSION_YES) {
\core\session\manager::write_close();
}
// If the controller has decided that we can include files, then check the setting, otherwise do not include files.
if ($this->get_include_files()) {
$this->set_include_files((bool) $this->get_plan()->get_setting('files')->get_value());