MDL-11912 Creating 1000's layer directory first, then userid directory: no need for...

diff --git a/backup/backuplib.php b/backup/backuplib.php
index 135ce99af4e3dcc548d17455ffb6f636ac074cc1..e49dac9ab3fd0ebf5c0c05fc08797a0efad70638 100644 (file)
--- a/backup/backuplib.php
+++ b/backup/backuplib.php
@@ -2219,7 +2219,18 @@
             $data = count_records("backup_ids","backup_code",$preferences->backup_unique_code, "table_name","user", "old_id",$userid);
             //If exists, copy it
             if ($data) {
-                $status = backup_copy_file($userinfo['basedir'] . '/' . $userinfo['userfolder'], 
+                $parts = explode('/', $userinfo['userfolder']);
+                $status = true;
+
+                if (is_array($parts)) {
+                    $group = $parts[0];
+                    $userid = $parts[1];
+
+                    // Create group dir first
+                    $status = check_dir_exists($userinfo['basedir'] . '/' . $group, true);
+                }
+                
+                $status = $status && backup_copy_file($userinfo['basedir'] . '/' . $userinfo['userfolder'], 
                     "$CFG->dataroot/temp/backup/$preferences->backup_unique_code/user_files/{$userinfo['userfolder']}");
             }
         }

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 3371cb52327babb89d72e81038bac7d334071713..e0bbc0bd34c6c6f3c29d4aac0dbaf4b052afb875 100644 (file)
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -4183,7 +4183,7 @@ function get_user_directories($only_non_empty=true, $legacy=false) {
     $dirlist = array();
 
     //Check if directory exists 
-    if (is_dir($rootdir)) { 
+    if (check_dir_exists($rootdir, true)) { 
         if ($legacy) {
             if ($userlist = get_directory_list($rootdir, '', true, true, false)) {
                 foreach ($userlist as $userid) {