From: skodak <skodak>
Date: Wed, 19 Mar 2008 23:09:00 +0000 (+0000)
Subject: MDL-13990 ignore bogus dirs in moodledata/user during upgrade; merged from MOODLE_19_... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=8d08612b121a0091040c5fa20039ddc77b7f3301;p=moodle.git

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

diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
index 0ceac471e9..09d6ba49c5 100644
--- 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