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

MDL-18469 Minor changes to restore silenty/import before implementing checksum. Merged from 19_STABLE

Browse Source
This commit is contained in:
stronk7
2009-10-02 12:50:19 +00:00
parent c9c5cc81e9
commit eb25bbcbc8
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backup/restorelib.php
+6 -3
View File
@@ -7933,7 +7933,7 @@ define('RESTORE_GROUPS_GROUPINGS', 3);
}
//We compare Moodle's versions
if ($CFG->version < $info->backup_moodle_version && $status) {
if ($status && $CFG->version < $info->backup_moodle_version) {
$message = new object();
$message->serverversion = $CFG->version;
$message->serverrelease = $CFG->release;
@@ -8003,8 +8003,9 @@ define('RESTORE_GROUPS_GROUPINGS', 3);
global $SESSION, $DB;
$restore->backup_unique_code=$backup_unique_code;
$restore->users = 2; // yuk
$restore->course_files = $SESSION->restore->restore_course_files;
$restore->site_files = $SESSION->restore->restore_site_files;
// we set these from restore object on silent restore and from info (backup) object on import
$restore->course_files = isset($SESSION->restore->restore_course_files) ? $SESSION->restore->restore_course_files : $SESSION->info->backup_course_files;
$restore->site_files = isset($SESSION->restore->restore_site_files) ? $SESSION->restore->restore_site_files : $SESSION->info->backup_site_files;
if ($allmods = $DB->get_records("modules")) {
foreach ($allmods as $mod) {
$modname = $mod->name;
@@ -8020,12 +8021,14 @@ define('RESTORE_GROUPS_GROUPINGS', 3);
function backup_to_restore_array($backup,$k=0) {
if (is_array($backup) ) {
$restore = array();
foreach ($backup as $key => $value) {
$newkey = str_replace('backup','restore',$key);
$restore[$newkey] = backup_to_restore_array($value,$key);
}
}
else if (is_object($backup)) {
$restore = new stdClass();
$tmp = get_object_vars($backup);
foreach ($tmp as $key => $value) {
$newkey = str_replace('backup','restore',$key);