MDL-12817 logout before 1.9 upgrade in order to prevent weird upgrade problems; merge...

diff --git a/admin/index.php b/admin/index.php
index 910e463ab18d4e04332431ade641dce1c5d1e1b3..fa14858c82920b3144fbc3ae8ed25f5c8eec7fab 100644 (file)
--- a/admin/index.php
+++ b/admin/index.php
@@ -258,8 +258,9 @@
             $CFG->debug = DEBUG_MINIMAL;
             error_reporting($CFG->debug);
 
-            // logout in case we are upgrading from pre 1.7 version - prevention of weird session problems
-            if ($CFG->version < 2006050600) {
+            // logo ut in case we are upgrading from pre 1.9 version in order to prevent
+            // weird session/role problems caused by incorrect data in USER and SESSION
+            if ($CFG->version < 2007101500) {
                 require_logout();
             }