mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 22:08:20 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-81119-forced-config' of https://github.com/bwalkerl/moodle

Browse Source
This commit is contained in:
Sara Arjona 2024-07-19 12:37:07 +02:00
commit fc59fe647b
No known key found for this signature in database
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
admin/tool/recyclebin/classes/category_bin.php
View File

@ -117,7 +117,9 @@ class category_bin extends base_bin {
// This hack will be removed once recycle bin switches to use its own backup mode, with
// own preferences and 100% separate from MOODLE_AUTOMATED.
// TODO: Remove this as part of MDL-65228.
$CFG->forced_plugin_settings['backup'] = ['backup_auto_storage' => 0, 'backup_auto_files' => 1];
$forcedbackupsettings = $CFG->forced_plugin_settings['backup'] ?? null;
$CFG->forced_plugin_settings['backup']['backup_auto_storage'] = 0;
$CFG->forced_plugin_settings['backup']['backup_auto_files'] = 1;
// Backup the course.
$user = get_admin();
@ -131,9 +133,9 @@ class category_bin extends base_bin {
);
$controller->execute_plan();
// We don't need the forced setting anymore, hence unsetting it.
// We don't need the forced setting anymore, hence restore previous settings.
// TODO: Remove this as part of MDL-65228.
unset($CFG->forced_plugin_settings['backup']);
$CFG->forced_plugin_settings['backup'] = $forcedbackupsettings;
// Grab the result.
$result = $controller->get_results();
@ -251,7 +253,9 @@ class category_bin extends base_bin {
// This hack will be removed once recycle bin switches to use its own backup mode, with
// own preferences and 100% separate from MOODLE_AUTOMATED.
// TODO: Remove this as part of MDL-65228.
$CFG->forced_plugin_settings['restore'] = ['restore_general_users' => 1, 'restore_general_groups' => 1];
$forcedrestoresettings = $CFG->forced_plugin_settings['restore'] ?? null;
$CFG->forced_plugin_settings['restore']['restore_general_users'] = 1;
$CFG->forced_plugin_settings['restore']['restore_general_groups'] = 1;
// Define the import.
$controller = new \restore_controller(
@ -287,9 +291,9 @@ class category_bin extends base_bin {
// Run the import.
$controller->execute_plan();
// We don't need the forced setting anymore, hence unsetting it.
// We don't need the forced setting anymore, hence restore previous settings.
// TODO: Remove this as part of MDL-65228.
unset($CFG->forced_plugin_settings['restore']);
$CFG->forced_plugin_settings['restore'] = $forcedrestoresettings;
// Have finished with the controller, let's destroy it, freeing mem and resources.
$controller->destroy();

16
admin/tool/recyclebin/classes/course_bin.php
View File

@ -121,7 +121,9 @@ class course_bin extends base_bin {
// This hack will be removed once recycle bin switches to use its own backup mode, with
// own preferences and 100% separate from MOODLE_AUTOMATED.
// TODO: Remove this as part of MDL-65228.
$CFG->forced_plugin_settings['backup'] = ['backup_auto_storage' => 0, 'backup_auto_files' => 1];
$forcedbackupsettings = $CFG->forced_plugin_settings['backup'] ?? null;
$CFG->forced_plugin_settings['backup']['backup_auto_storage'] = 0;
$CFG->forced_plugin_settings['backup']['backup_auto_files'] = 1;
// Backup the activity.
$user = get_admin();
@ -145,9 +147,9 @@ class course_bin extends base_bin {
$controller->execute_plan();
// We don't need the forced setting anymore, hence unsetting it.
// We don't need the forced setting anymore, hence restore previous settings.
// TODO: Remove this as part of MDL-65228.
unset($CFG->forced_plugin_settings['backup']);
$CFG->forced_plugin_settings['backup'] = $forcedbackupsettings;
// Grab the result.
$result = $controller->get_results();
@ -252,7 +254,9 @@ class course_bin extends base_bin {
// This hack will be removed once recycle bin switches to use its own backup mode, with
// own preferences and 100% separate from MOODLE_AUTOMATED.
// TODO: Remove this as part of MDL-65228.
$CFG->forced_plugin_settings['restore'] = ['restore_general_users' => 1, 'restore_general_groups' => 1];
$forcedrestoresettings = $CFG->forced_plugin_settings['restore'] ?? null;
$CFG->forced_plugin_settings['restore']['restore_general_users'] = 1;
$CFG->forced_plugin_settings['restore']['restore_general_groups'] = 1;
// Define the import.
$controller = new \restore_controller(
@ -284,9 +288,9 @@ class course_bin extends base_bin {
// Run the import.
$controller->execute_plan();
// We don't need the forced setting anymore, hence unsetting it.
// We don't need the forced setting anymore, hence restore previous settings.
// TODO: Remove this as part of MDL-65228.
unset($CFG->forced_plugin_settings['restore']);
$CFG->forced_plugin_settings['restore'] = $forcedrestoresettings;
// Have finished with the controller, let's destroy it, freeing mem and resources.
$controller->destroy();