Commit 6dd73397 authored by Robert Lyon's avatar Robert Lyon
Browse files

Bug 1607564: Remove not needed quarantine dirs



The old ones based on lang strings

behatnotneeded - can't test dataroot

Change-Id: I08963fd73f2d2102c9c34535593e8afb50b6104b
Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
parent 039c111b
......@@ -4752,5 +4752,16 @@ function xmldb_core_upgrade($oldversion=0) {
ini_set('max_execution_time', $cur_max_execution_time);
}
if ($oldversion < 2016110500) {
log_debug('Consolidate dataroot file quarantine area');
foreach ($languages = array_keys(get_languages()) as $language) {
$langstr = get_string_from_language($language, 'quarantinedirname', 'mahara');
if ($langstr != 'quarantine' && substr($langstr, 0, 2) != '[[') {
require_once(get_config('docroot') . 'lib/file.php');
rmdirr(get_config('dataroot') . $langstr);
}
}
}
return $status;
}
......@@ -16,7 +16,7 @@ $config = new stdClass();
// See https://wiki.mahara.org/wiki/Developer_Area/Version_Numbering_Policy
// For upgrades on stable branches, increment the version by one. On master, use the date.
$config->version = 2016100600;
$config->version = 2016110500;
$config->series = '17.04';
$config->release = '17.04dev';
$config->minupgradefrom = 2012080604;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment