Now user_files are restored if the user existed previously but he

doesn't have a dir under the users dir.
See bug 1123 (http://moodle.org/bugs/bug.php?op=show&bugid=1123)

diff --git a/backup/restorelib.php b/backup/restorelib.php
index efd435f4b83f65bd238b64e884de544dcde59f6b..051fc538f8efc9b6f4aa41d697c539f972697434 100644 (file)
--- a/backup/restorelib.php
+++ b/backup/restorelib.php
@@ -1065,7 +1065,9 @@
                     //If thar user exists in backup_ids
                     if ($data) {
                         //Only it user has been created now
-                        if (strpos($data->info,"new") !== false) {
+                        //or if it existed previously, but he hasn't image (see bug 1123)
+                        if ((strpos($data->info,"new") !== false) or 
+                            (!check_dir_exists($dest_dir."/".$data->new_id,false))) {
                             //Copy the old_dir to its new location (and name) !!
                             //Only if destination doesn't exists
                             if (!file_exists($dest_dir."/".$data->new_id)) {