MDL-14605 removing stats upgrade stuff

diff --git a/admin/cliupgrade.php b/admin/cliupgrade.php
index 1751a0ed1d89e2bfb3aab829f0b20697b2bc4b8a..a47a0acd2d78fb478c11d41d2c2dc793cd76279f 100644 (file)
--- a/admin/cliupgrade.php
+++ b/admin/cliupgrade.php
@@ -882,7 +882,6 @@ if ( file_exists(dirname(dirname(__FILE__)) . '/config.php')) {
         if ($status) {
             // Install the roles system.
             moodle_install_roles();
-            set_config('statsrolesupgraded',time());
 
             // Write default settings unconditionally (i.e. even if a setting is already set, overwrite it)
             // (this should only have any effect during initial install).

diff --git a/admin/index.php b/admin/index.php
index 1ed262cb73e9302fd4d518f9db7ede8ef54d0fff..60cb459538b9b9bcee302f703d11f590f6b6c6de 100644 (file)
--- a/admin/index.php
+++ b/admin/index.php
@@ -193,7 +193,6 @@
 
             // Install the roles system.
             moodle_install_roles();
-            set_config('statsrolesupgraded',time());
 
             // install core event handlers
             events_update_definition();

diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
index dbae6e799bfb08ed3683ec0fb3dd19dcd3c95710..f89268996c39985e8931cc759eac328921dcfc84 100644 (file)
--- a/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@ -55,6 +55,12 @@ function xmldb_main_upgrade($oldversion=0) {
         upgrade_main_savepoint($result, 2008050100);
     }
 
+    if ($result && $oldversion < 2008050200) {
+        // remove unused config options
+        unset_config('statsrolesupgraded');
+        upgrade_main_savepoint($result, 2008050200);
+    }
+
     return $result;
 }
 

diff --git a/version.php b/version.php
index bf8199dba8371781c429c4f1ee96213f2ed88e62..9178825dfddfedba9afef734bf44788eaa3e716b 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 = 2008050100;  // YYYYMMDD   = date of the last version bump
+    $version = 2008050200;  // YYYYMMDD   = date of the last version bump
                             //         XX = daily increments
 
     $release = '2.0 dev (Build: 20080502)';  // Human-friendly version name