Merge branch 'MDL-72517-master' of git://github.com/cescobedo/moodle

lib/classes/plugin_manager.php

@@ -1726,7 +1726,7 @@ public static function is_deleted_standard_plugin($type, $name) {
         // branch, listed should be no plugins that were removed at 1.9.x - 2.1.x versions as
         // Moodle 2.3 supports upgrades from 2.2.x only.
         $plugins = array(
-            'qformat' => array('blackboard', 'learnwise'),
+            'qformat' => array('blackboard', 'learnwise', 'examview'),
             'auth' => array('radius', 'fc', 'nntp', 'pam', 'pop3', 'imap'),
             'block' => array('course_overview', 'messages', 'community', 'participants'),
             'cachestore' => array('memcache'),
@@ -1972,7 +1972,7 @@ public static function standard_plugins_list($type) {
             ),
 
             'qformat' => array(
-                'aiken', 'blackboard_six', 'examview', 'gift',
+                'aiken', 'blackboard_six', 'gift',
                 'missingword', 'multianswer',
                 'xhtml', 'xml'
             ),

lib/db/upgrade.php

@@ -2882,5 +2882,15 @@ function xmldb_main_upgrade($oldversion) {
         upgrade_main_savepoint(true, 2021100300.02);
     }
 
+    if ($oldversion < 2021100600.01) {
+        // Remove qformat_examview (unless it has manually been added back).
+        if (!file_exists($CFG->dirroot . '/question/format/examview/format.php')) {
+            unset_all_config_for_plugin('qformat_examview');
+        }
+
+        // Main savepoint reached.
+        upgrade_main_savepoint(true, 2021100600.01);
+    }
+
     return true;
 }