MDL-8605 Preventing new user folder from being created when original folder is empty

diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
index 7d97d4a23d82634018e8b1096c7a8fca9972d560..b4d615f74a6cfeccd8e3abd82d916e930a563187 100644 (file)
--- a/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@ -2555,6 +2555,11 @@ function xmldb_main_upgrade($oldversion=0) {
         
         foreach ($folders as $userid) {
             $olddir = $oldusersdir . '/' . $userid;
+            $files = get_directory_list($olddir);
+            
+            if (empty($files)) {
+                continue;
+            }
 
             // Create new user directory
             if (!$newdir = make_user_directory($userid)) {
@@ -2564,7 +2569,6 @@ function xmldb_main_upgrade($oldversion=0) {
 
             // Move contents of old directory to new one
             if (file_exists($olddir) && file_exists($newdir)) {
-                $files = get_directory_list($olddir);
                 foreach ($files as $file) {
                     copy($olddir . '/' . $file, $newdir . '/' . $file);
                 }