Merge branch 'MDL-72347-master' of git://github.com/sarjona/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 5 Oct 2021 03:14:51 +0000 (11:14 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Oct 2021 21:20:38 +0000 (23:20 +0200)
1  2 
lib/classes/plugin_manager.php
lib/db/upgrade.php
version.php

Simple merge
@@@ -2863,14 -2863,14 +2863,24 @@@ function xmldb_main_upgrade($oldversion
      }
  
      if ($oldversion < 2021100300.01) {
 -        upgrade_main_savepoint(true, 2021100300.01);
 +        // Remove repository_skydrive (unless it has manually been added back).
 +        if (!file_exists($CFG->dirroot . '/repository/skydrive/lib.php')) {
 +            unset_all_config_for_plugin('repository_skydrive');
 +        }
 +
 +        // Main savepoint reached.
 +        upgrade_main_savepoint(true, 2021100300.01);
 +    }
 +
++    if ($oldversion < 2021100300.02) {
+         // Remove filter_censor (unless it has manually been added back).
+         if (!file_exists($CFG->dirroot . '/filter/censor/filter.php')) {
+             unset_all_config_for_plugin('filter_censor');
+         }
+         // Main savepoint reached.
++        upgrade_main_savepoint(true, 2021100300.02);
+     }
      return true;
  }
diff --cc version.php
@@@ -29,7 -29,7 +29,7 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
--$version  = 2021100300.01;              // YYYYMMDD      = weekly release date of this DEV branch.
++$version  = 2021100300.02;              // YYYYMMDD      = weekly release date of this DEV branch.
                                          //         RR    = release increments - 00 in DEV branches.
                                          //           .XX = incremental changes.
  $release  = '4.0dev (Build: 20211003)'; // Human-friendly version name