Save one extra query per user being restored. $newid contains the user id along all...

Merged from MOODLE_19_STABLE

diff --git a/backup/restorelib.php b/backup/restorelib.php
index 7a5490022181d15bba024aa50421fa11883e2c02..0c128bdd0e0dedf700938aa1132f047cf9fa172d 100644 (file)
--- a/backup/restorelib.php
+++ b/backup/restorelib.php
@@ -2573,17 +2573,10 @@ define('RESTORE_GROUPS_GROUPINGS', 3);
 
                 //Here, if create_preferences, do it as necessary
                 if ($create_preferences) {
-                    //echo "Checking for preferences of user ".$user->username."<br />";         //Debug
-                    //Get user new id from backup_ids
-                    $data = backup_getid($restore->backup_unique_code,"user",$userid);
-                    $newid = $data->new_id;
                     if (isset($user->user_preferences)) {
-                        //echo "Preferences exist in backup file<br />";                         //Debug
                         foreach($user->user_preferences as $user_preference) {
-                            //echo $user_preference->name." = ".$user_preference->value."<br />";    //Debug
                             //We check if that user_preference exists in DB
                             if (!record_exists("user_preferences","userid",$newid,"name",$user_preference->name)) {
-                                //echo "Creating it<br />";                                              //Debug
                                 //Prepare the record and insert it
                                 $user_preference->userid = $newid;
                                 $status = insert_record("user_preferences",$user_preference);
@@ -2591,6 +2584,7 @@ define('RESTORE_GROUPS_GROUPINGS', 3);
                         }
                     }
                 }
+
                 //Do some output
                 $counter++;
                 if ($counter % 10 == 0) {