Permalink
Browse files

Merge branch 'MDL-61714-33' of git://github.com/sarjona/moodle into M…

…OODLE_33_STABLE
  • Loading branch information...
dmonllao committed May 10, 2018
2 parents 255bc95 + 7658ef1 commit 3bd2c9cc2d92b7de4a6a617f51ddc5be0648889c
Showing with 25 additions and 19 deletions.
  1. +9 −18 admin/settings/users.php
  2. +15 −0 lib/db/upgrade.php
  3. +1 −1 version.php
@@ -230,27 +230,18 @@
$setting->set_force_ltr(true);
$temp->add($setting);
// See {@link https://gdpr-info.eu/art-8-gdpr/}.
$ageofdigitalconsentmap = implode(PHP_EOL, [
'*, 16',
'AT, 14',
'ES, 14',
'SI, 14',
'US, 13'
]);
$setting = new admin_setting_agedigitalconsentmap('agedigitalconsentmap',
new lang_string('ageofdigitalconsentmap', 'admin'),
new lang_string('ageofdigitalconsentmap_desc', 'admin'),
// See {@link https://gdpr-info.eu/art-8-gdpr/}.
implode(PHP_EOL, [
'*, 16',
'AT, 14',
'CZ, 13',
'DE, 14',
'DK, 13',
'ES, 13',
'FI, 15',
'GB, 13',
'HU, 14',
'IE, 13',
'LT, 16',
'LU, 16',
'NL, 16',
'PL, 13',
'SE, 13',
]),
$ageofdigitalconsentmap,
PARAM_RAW
);
$temp->add($setting);
@@ -2985,5 +2985,20 @@ function xmldb_main_upgrade($oldversion) {
upgrade_main_savepoint(true, 2017051504.08);
}
if ($oldversion < 2017051505.11) {
// Update default digital age consent map according to the current legislation on each country.
$ageofdigitalconsentmap = implode(PHP_EOL, [
'*, 16',
'AT, 14',
'ES, 14',
'SI, 14',
'US, 13'
]);
set_config('agedigitalconsentmap', $ageofdigitalconsentmap);
// Main savepoint reached.
upgrade_main_savepoint(true, 2017051505.11);
}
return true;
}
@@ -29,7 +29,7 @@
defined('MOODLE_INTERNAL') || die();
$version = 2017051505.10; // 20170515 = branching date YYYYMMDD - do not modify!
$version = 2017051505.11; // 20170515 = branching date YYYYMMDD - do not modify!
// RR = release increments - 00 in DEV branches.
// .XX = incremental changes.

0 comments on commit 3bd2c9c

Please sign in to comment.