Now user->guid is in backup & restore

Merged some pending changes from STABLE too.

diff --git a/backup/backuplib.php b/backup/backuplib.php
index 0388341ddf2bab0740af09e012bf8a1ebc959a20..1b90b0f3887e2868a0a2d26ea0055e7915934375 100644 (file)
--- a/backup/backuplib.php
+++ b/backup/backuplib.php
@@ -534,18 +534,12 @@
         fwrite ($bf,start_tag("HEADER",2,true));
 
         //Get info from course
-        $course=false;
-        if ($courses = get_records("course","id",$preferences->backup_course)) {
-            $course = $courses[$preferences->backup_course];
-        }
+        $course = get_record("course","id",$preferences->backup_course);
         if ($course) {
             //Prints course info
             fwrite ($bf,full_tag("ID",3,false,$course->id));
             //Obtain the category
-            $category = false;
-            if ($categories = get_records("course_categories","id","$course->category")) {
-                $category = $categories[$course->category];
-            }
+            $category = get_record("course_categories","id","$course->category");
             if ($category) {
                 //Prints category info
                 fwrite ($bf,start_tag("CATEGORY",3,true));
@@ -721,6 +715,7 @@
                 //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("DELETED",4,false,$user_data->deleted));
                 fwrite ($bf,full_tag("USERNAME",4,false,$user_data->username));

diff --git a/backup/restorelib.php b/backup/restorelib.php
index 8b2d5ca8ed4912ea9039fe5ad3cd0572fcf3557b..0986a6946ab23fedd844bc77a2705eddf5bc7223 100644 (file)
--- a/backup/restorelib.php
+++ b/backup/restorelib.php
@@ -2443,6 +2443,9 @@
                         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;