Skip to content

Commit 464a6c7

Browse files
author
David Monllao
committed
Merge branch 'MDL-61714-34' of git://github.com/sarjona/moodle into MOODLE_34_STABLE
2 parents 43f8620 + 3c3451b commit 464a6c7

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
@@ -227,27 +227,18 @@
227227
$setting->set_force_ltr(true);
228228
$temp->add($setting);
229229

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

lib/db/upgrade.php

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2835,5 +2835,20 @@ function xmldb_main_upgrade($oldversion) {
28352835
upgrade_main_savepoint(true, 2017111301.08);
28362836
}
28372837

2838+
if ($oldversion < 2017111302.12) {
2839+
// Update default digital age consent map according to the current legislation on each country.
2840+
$ageofdigitalconsentmap = implode(PHP_EOL, [
2841+
'*, 16',
2842+
'AT, 14',
2843+
'ES, 14',
2844+
'SI, 14',
2845+
'US, 13'
2846+
]);
2847+
set_config('agedigitalconsentmap', $ageofdigitalconsentmap);
2848+
2849+
// Main savepoint reached.
2850+
upgrade_main_savepoint(true, 2017111302.12);
2851+
}
2852+
28382853
return true;
28392854
}

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 = 2017111302.11; // 20171113 = branching date YYYYMMDD - do not modify!
32+
$version = 2017111302.12; // 20171113 = branching date YYYYMMDD - do not modify!
3333
// RR = release increments - 00 in DEV branches.
3434
// .XX = incremental changes.
3535

0 commit comments

Comments
 (0)