MDL-8487 if user language do not exist during restore use site default

diff --git a/backup/restorelib.php b/backup/restorelib.php
index 053ce054dcf77e6ae94686143248beed720b17ac..e1cfecd1d757ce2d05bb5ec62bb7052b1d01b1df 100644 (file)
--- a/backup/restorelib.php
+++ b/backup/restorelib.php
@@ -1464,6 +1464,9 @@
             // Grab mnethosts keyed by wwwroot, to map to id
             $mnethosts = get_records('mnethost', '', '', 
                                      'wwwroot', 'wwwroot, id');
+
+            $languages = get_list_of_languages();
+
             foreach ($info->users as $userid) {
                 $rec = backup_getid($restore->backup_unique_code,"user",$userid); 
                 $user = $rec->info;
@@ -1473,6 +1476,12 @@
                     $user->lang = 'mi_nt';
                 }
 
+
+                //If language does not exist here - use site default
+                if (!array_key_exists($user->lang, $languages)) {
+                    $user->lang = $CFG->lang;
+                } 
+
                 //Check if it's admin and coursecreator
                 $is_admin =         !empty($user->roles['admin']);
                 $is_coursecreator = !empty($user->roles['coursecreator']);