Skip to content

Commit

Permalink
Merge branch 'MDL-61714-master' of git://github.com/sarjona/moodle
Browse files Browse the repository at this point in the history
  • Loading branch information
David Monllao committed May 10, 2018
2 parents 74e82e4 + b1f1bd2 commit 4033c2a
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 19 deletions.
27 changes: 9 additions & 18 deletions admin/settings/users.php
Original file line number Diff line number Diff line change
Expand Up @@ -228,27 +228,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);
Expand Down
15 changes: 15 additions & 0 deletions lib/db/upgrade.php
Original file line number Diff line number Diff line change
Expand Up @@ -2216,5 +2216,20 @@ function xmldb_main_upgrade($oldversion) {
upgrade_main_savepoint(true, 2018040500.01);
}

if ($oldversion < 2018050900.01) {
// 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, 2018050900.01);
}

return true;
}
2 changes: 1 addition & 1 deletion version.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

defined('MOODLE_INTERNAL') || die();

$version = 2018050900.00; // YYYYMMDD = weekly release date of this DEV branch.
$version = 2018050900.01; // YYYYMMDD = weekly release date of this DEV branch.
// RR = release increments - 00 in DEV branches.
// .XX = incremental changes.

Expand Down

0 comments on commit 4033c2a

Please sign in to comment.