From: nicolasconnault <nicolasconnault>
Date: Tue, 16 Oct 2007 04:54:15 +0000 (+0000)
Subject: MDL-8605 Upgrade of user folder will not occur if the user folder already exists
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=2d4cf36b1445b295fcf16b614a54f6c0c4b279b0;p=moodle.git

MDL-8605 Upgrade of user folder will not occur if the user folder already exists
---

diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
index 9085daa34c..13429501a0 100644
--- a/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@ -2540,7 +2540,7 @@ function xmldb_main_upgrade($oldversion=0) {
         upgrade_main_savepoint($result, 2007100903);
     }
     
-    if ($result && $oldversion < 2007101500) {
+    if ($result && $oldversion < 2007101500 && !file_exists($CFG->dataroot . '/user')) {
         // Get list of users by browsing moodledata/user
         $oldusersdir = $CFG->dataroot . '/users';
         $folders = get_directory_list($oldusersdir, '', false, true, false);