upgrading to 1.5

steps 1, 2 and 3 done.

diff --git a/backup/CHANGES_14_15.txt b/backup/CHANGES_14_15.txt
index 4f0f41dfc189dcadd6e2013d85d01e91b7eacb61..2bc384131e35db76bccc6521c73b3ce31b4a7123 100644 (file)
--- a/backup/CHANGES_14_15.txt
+++ b/backup/CHANGES_14_15.txt
@@ -8,9 +8,9 @@ status in backup/restore code.
 
 Now I show the specific detailed status of every item in the process:
 
- 1. TODO: check user->idnumber
- 2. TODO: check user->lang (at restore set mi_nt where ma_nt).
- 3. TODO: check course->lang (at restore set mi_nt where ma_nt).
+ 1. DONE: check user->idnumber
+ 2. DONE: check user->lang (at restore set mi_nt where ma_nt).
+ 3. DONE: check course->lang (at restore set mi_nt where ma_nt).
  4. TODO: user_students->enrol (analyse and proceed).
  5. TODO: user_teachers->enrol (analyse and proceed).
  6. TODO: user->policyagreed (analyse and proceed).

diff --git a/backup/restorelib.php b/backup/restorelib.php
index 1b321d13d4c6a33fe2f453aadd9434268607835f..0c367c14a68b4bd792c2e41e83c31d9c571878cf 100644 (file)
--- a/backup/restorelib.php
+++ b/backup/restorelib.php
@@ -562,6 +562,12 @@
             } else {
                 $course->sortorder = 100;
             }
+
+            //Now, recode some languages (Moodle 1.5)
+            if ($course->lang == 'ma_nt') {
+                $course->lang = 'mi_nt';
+            }
+
             //Now insert the record
             $newid = insert_record("course",$course);
             if ($newid) {
@@ -793,6 +799,11 @@
                 $rec = backup_getid($restore->backup_unique_code,"user",$userid); 
                 $user = $rec->info;
 
+                //Now, recode some languages (Moodle 1.5)
+                if ($user->lang == 'ma_nt') {
+                    $user->lang = 'mi_nt';
+                }
+
                 //Check if it's admin and coursecreator
                 $is_admin =         !empty($user->roles['admin']);
                 $is_coursecreator = !empty($user->roles['coursecreator']);