Skip to content

Commit 3bd2c9c

Browse files
author
David Monllao
committed
Merge branch 'MDL-61714-33' of git://github.com/sarjona/moodle into MOODLE_33_STABLE
2 parents 255bc95 + 7658ef1 commit 3bd2c9c

File tree

3 files changed

+25
-19
lines changed

3 files changed

+25
-19
lines changed

admin/settings/users.php

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -230,27 +230,18 @@
230230
$setting->set_force_ltr(true);
231231
$temp->add($setting);
232232

233+
// See {@link https://gdpr-info.eu/art-8-gdpr/}.
234+
$ageofdigitalconsentmap = implode(PHP_EOL, [
235+
'*, 16',
236+
'AT, 14',
237+
'ES, 14',
238+
'SI, 14',
239+
'US, 13'
240+
]);
233241
$setting = new admin_setting_agedigitalconsentmap('agedigitalconsentmap',
234242
new lang_string('ageofdigitalconsentmap', 'admin'),
235243
new lang_string('ageofdigitalconsentmap_desc', 'admin'),
236-
// See {@link https://gdpr-info.eu/art-8-gdpr/}.
237-
implode(PHP_EOL, [
238-
'*, 16',
239-
'AT, 14',
240-
'CZ, 13',
241-
'DE, 14',
242-
'DK, 13',
243-
'ES, 13',
244-
'FI, 15',
245-
'GB, 13',
246-
'HU, 14',
247-
'IE, 13',
248-
'LT, 16',
249-
'LU, 16',
250-
'NL, 16',
251-
'PL, 13',
252-
'SE, 13',
253-
]),
244+
$ageofdigitalconsentmap,
254245
PARAM_RAW
255246
);
256247
$temp->add($setting);

lib/db/upgrade.php

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2985,5 +2985,20 @@ function xmldb_main_upgrade($oldversion) {
29852985
upgrade_main_savepoint(true, 2017051504.08);
29862986
}
29872987

2988+
if ($oldversion < 2017051505.11) {
2989+
// Update default digital age consent map according to the current legislation on each country.
2990+
$ageofdigitalconsentmap = implode(PHP_EOL, [
2991+
'*, 16',
2992+
'AT, 14',
2993+
'ES, 14',
2994+
'SI, 14',
2995+
'US, 13'
2996+
]);
2997+
set_config('agedigitalconsentmap', $ageofdigitalconsentmap);
2998+
2999+
// Main savepoint reached.
3000+
upgrade_main_savepoint(true, 2017051505.11);
3001+
}
3002+
29883003
return true;
29893004
}

version.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

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

32-
$version = 2017051505.10; // 20170515 = branching date YYYYMMDD - do not modify!
32+
$version = 2017051505.11; // 20170515 = branching date YYYYMMDD - do not modify!
3333
// RR = release increments - 00 in DEV branches.
3434
// .XX = incremental changes.
3535

0 commit comments

Comments
 (0)