course_modules->deleted and user->guid are now out.

(they disappeared from DB ages ago)

Merged from MOODLE_16_STABLE

diff --git a/backup/backuplib.php b/backup/backuplib.php
index 371d16bf58e7b9e571167fe3e9cd89f81696a2f6..c01c6cd68f216c9b1005274f07a6170c5e16164a 100644 (file)
--- a/backup/backuplib.php
+++ b/backup/backuplib.php
@@ -1001,7 +1001,6 @@
                fwrite ($bf,full_tag("TYPE",6,false,$moduletype));
                fwrite ($bf,full_tag("INSTANCE",6,false,$course_module[$tok]->instance));
                fwrite ($bf,full_tag("ADDED",6,false,$course_module[$tok]->added));
-               fwrite ($bf,full_tag("DELETED",6,false,$course_module[$tok]->deleted));
                fwrite ($bf,full_tag("SCORE",6,false,$course_module[$tok]->score));
                fwrite ($bf,full_tag("INDENT",6,false,$course_module[$tok]->indent));
                fwrite ($bf,full_tag("VISIBLE",6,false,$course_module[$tok]->visible));
@@ -1048,7 +1047,6 @@
                 //Output all user data
                 fwrite ($bf,full_tag("ID",4,false,$user_data->id));
                 fwrite ($bf,full_tag("AUTH",4,false,$user_data->auth));
-                fwrite ($bf,full_tag("GUID",4,false,$user_data->guid));
                 fwrite ($bf,full_tag("CONFIRMED",4,false,$user_data->confirmed));
                 fwrite ($bf,full_tag("POLICYAGREED",4,false,$user_data->policyagreed));
                 fwrite ($bf,full_tag("DELETED",4,false,$user_data->deleted));

diff --git a/backup/restorelib.php b/backup/restorelib.php
index 69b41c370bace5d201f82a9add10156a27b2f655..8d889efaa70c5b6cee47039f2304a41245658cea 100644 (file)
--- a/backup/restorelib.php
+++ b/backup/restorelib.php
@@ -889,7 +889,6 @@
                                         $course_module->module = $module->id;
                                         $course_module->section = $newid;
                                         $course_module->added = $mod->added;
-                                        $course_module->deleted = $mod->deleted;
                                         $course_module->score = $mod->score;
                                         $course_module->indent = $mod->indent;
                                         $course_module->visible = $mod->visible;
@@ -3591,8 +3590,6 @@
                                 $this->info->tempmod->instance;
                             $this->info->tempsection->mods[$this->info->tempmod->id]->added = 
                                 $this->info->tempmod->added;
-                            $this->info->tempsection->mods[$this->info->tempmod->id]->deleted = 
-                                $this->info->tempmod->deleted;
                             $this->info->tempsection->mods[$this->info->tempmod->id]->score = 
                                 $this->info->tempmod->score;
                             $this->info->tempsection->mods[$this->info->tempmod->id]->indent = 
@@ -3618,9 +3615,6 @@
                         case "ADDED":
                             $this->info->tempmod->added = $this->getContents();
                             break;
-                        case "DELETED":
-                            $this->info->tempmod->deleted = $this->getContents();
-                            break;
                         case "SCORE":
                             $this->info->tempmod->score = $this->getContents();
                             break;
@@ -3847,9 +3841,6 @@
                         case "AUTH": 
                             $this->info->tempuser->auth = $this->getContents();
                             break;
-                        case "GUID": 
-                            $this->info->tempuser->guid = $this->getContents();
-                            break;
                         case "CONFIRMED": 
                             $this->info->tempuser->confirmed = $this->getContents();
                             break;