moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-07 18:06:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-72348-master' of git://github.com/sarjona/moodle

Browse source
This commit is contained in:
Andrew Nicols 2021-10-05 11:03:05 +08:00 • committed by Eloy Lafuente (stronk7)
commit 04ff28f00c
14 changed files with 28 additions and 637 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/classes/plugin_manager.php
View file

@ -1731,7 +1731,7 @@ class core_plugin_manager {
'message' => array('jabber'),
'quizaccess' => array('safebrowser'),
'report' => array('search'),
'repository' => array('alfresco', 'picasa'),
'repository' => array('alfresco', 'picasa', 'skydrive'),
'tinymce' => array('dragmath'),
'tool' => array('bloglevelupgrade', 'qeupgradehelper', 'timezoneimport', 'assignmentupgrade', 'health'),
'theme' => array('bootstrapbase', 'clean', 'more', 'afterburner', 'anomaly', 'arialist', 'base',
@ -1996,7 +1996,7 @@ class core_plugin_manager {
'repository' => array(
'areafiles', 'boxnet', 'contentbank', 'coursefiles', 'dropbox', 'equella', 'filesystem',
'flickr', 'flickr_public', 'googledocs', 'local', 'merlot', 'nextcloud',
'onedrive', 'recent', 'skydrive', 's3', 'upload', 'url', 'user', 'webdav',
'onedrive', 'recent', 's3', 'upload', 'url', 'user', 'webdav',
'wikimedia', 'youtube'
),

10
lib/db/upgrade.php
View file

@ -2862,5 +2862,15 @@ function xmldb_main_upgrade($oldversion) {
upgrade_main_savepoint(true, 2021092400.03);
}
if ($oldversion < 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);
}
return true;
}