MDL-30604 Added 2 missing messages andd deleting an incorrect one

diff --git a/enrol/flatfile/db/upgrade.php b/enrol/flatfile/db/upgrade.php
index 2cb5a4c..03a5e0f 100644 (file)
--- a/enrol/flatfile/db/upgrade.php
+++ b/enrol/flatfile/db/upgrade.php
@@ -62,6 +62,8 @@ function xmldb_enrol_flatfile_upgrade($oldversion) {
         upgrade_plugin_savepoint(true, 2010091400, 'enrol', 'flatfile');
     }
 
+    // Moodle v2.2.0 release upgrade line
+    // Put any upgrade step following this
 
     return $result;
 }

diff --git a/enrol/guest/db/upgrade.php b/enrol/guest/db/upgrade.php
index d04b36e..b19b5a6 100644 (file)
--- a/enrol/guest/db/upgrade.php
+++ b/enrol/guest/db/upgrade.php
@@ -30,6 +30,9 @@ function xmldb_enrol_guest_upgrade($oldversion) {
 
     $dbman = $DB->get_manager();
 
+    // Moodle v2.2.0 release upgrade line
+    // Put any upgrade step following this
+
     if ($oldversion < 2011112901) {
         // convert all null passwords to empty strings
         $DB->set_field('enrol', 'password', '', array('enrol'=>'guest', 'password'=>null));

diff --git a/question/upgrade.php b/question/upgrade.php
index 0c8a87f..fbedeb7 100644 (file)
--- a/question/upgrade.php
+++ b/question/upgrade.php
@@ -41,8 +41,5 @@ function question_fix_random_question_parents() {
     global $CFG, $DB;
     $DB->execute("UPDATE {question} SET parent = id WHERE qtype = 'random' AND parent <> id");
 
-    // Moodle v2.2.0 release upgrade line
-    // Put any upgrade step following this
-
     return true;
 }