MDL-12720 removing confusing/not implemented CONTEXT_PERSONAL; merged from MOODLE_19_...

diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
index 41ab52e081933428115a0d6ccb03eaaaf507462f..9ff44a8f54a8f0e4ac41e80b1be51b7df3fd0c48 100644 (file)
--- a/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@ -2658,6 +2658,19 @@ function xmldb_main_upgrade($oldversion=0) {
         upgrade_main_savepoint($result, 2007101505);
     }
 
+    if ($result && $oldversion < 2007101506) {
+
+    /// CONTEXT_PERSONAL was never implemented - removing
+        $sql = "DELETE
+                  FROM {$CFG->prefix}context
+                 WHERE contextlevel=20";
+ 
+        execute_sql($sql);
+
+    /// Main savepoint reached
+        upgrade_main_savepoint($result, 2007101506);
+    }
+
     return $result;
 }
 

diff --git a/version.php b/version.php
index f9043a73035ea52cd291644e0277965046cd82e7..c2ae2c2a7ae2f832af7c4e6ced1e147867431577 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 = 2007101505;  // YYYYMMDD = date
+    $version = 2007101506;  // YYYYMMDD = date
                             //       XY = increments within a single day
 
     $release = '2.0 dev';   // Human-friendly version name