MDL-13990 ignore bogus dirs in moodledata/user during upgrade; merged from MOODLE_19_...

diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
index 0ceac471e9f372442ba4101621d99fd392d548c4..09d6ba49c5be98d5c9b4581178b71695bbc97c17 100644 (file)
--- a/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@ -2584,8 +2584,8 @@ function xmldb_main_upgrade($oldversion=0) {
 
             // Create new user directory
             if (!$newdir = make_user_directory($userid)) {
-                $result = false;
-                break;
+                // some weird directory - do not stop the upgrade, just ignore it
+                continue;
             }
 
             // Move contents of old directory to new one