MDL-8605 putting versions in sync between 1.9 and head

diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
index 78a478579f56ac68e13580bd908fa760268d54ba..9085daa34c0eac6bb63ffb01d5ec0a3359d40367 100644 (file)
--- 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 < 2007101100) {
+    if ($result && $oldversion < 2007101500) {
         // Get list of users by browsing moodledata/user
         $oldusersdir = $CFG->dataroot . '/users';
         $folders = get_directory_list($oldusersdir, '', false, true, false);

diff --git a/version.php b/version.php
index b927d5a61209c75f7e985196db74c852cbca62cc..3256efd4134b98eb9a01d9a09cd6770d9d0b9114 100644 (file)
--- a/version.php
+++ b/version.php
@@ -6,7 +6,7 @@
 // This is compared against the values stored in the database to determine
 // whether upgrades should be performed (see lib/db/*.php)
 
-    $version = 2007101100;  // YYYYMMDD = date
+    $version = 2007101500;  // YYYYMMDD = date
                             //       XY = increments within a single day
 
     $release = '2.0 dev';   // Human-friendly version name