Merge branch 'wip-MDL-61876-master-fix' of https://github.com/marinaglancy/moodle

This commit is contained in:
Eloy Lafuente (stronk7) 2018-05-04 12:11:16 +02:00
commit fcb7459569
2 changed files with 11 additions and 1 deletions

View File

@ -2216,5 +2216,15 @@ function xmldb_main_upgrade($oldversion) {
upgrade_main_savepoint(true, 2018040500.01);
}
if ($oldversion < 2018050200.01) {
// For upgraded sites we set $CFG->forceclean to 0 to preserve the current behavior.
// For new sites the default for this setting will be 1.
set_config('forceclean', 0);
// Main savepoint reached.
upgrade_main_savepoint(true, 2018050200.01);
}
return true;
}

View File

@ -29,7 +29,7 @@
defined('MOODLE_INTERNAL') || die();
$version = 2018050200.00; // YYYYMMDD = weekly release date of this DEV branch.
$version = 2018050200.01; // YYYYMMDD = weekly release date of this DEV branch.
// RR = release increments - 00 in DEV branches.
// .XX = incremental changes.