Merge branch 'MDL-61714-master' of git://github.com/sarjona/moodle
authorDavid Monllao <davidm@moodle.com>
Fri, 11 May 2018 09:31:22 +0000 (11:31 +0200)
committerDavid Monllao <davidm@moodle.com>
Fri, 11 May 2018 09:31:22 +0000 (11:31 +0200)
1  2 
lib/db/upgrade.php

diff --combined lib/db/upgrade.php
@@@ -2216,19 -2216,18 +2216,18 @@@ function xmldb_main_upgrade($oldversion
          upgrade_main_savepoint(true, 2018040500.01);
      }
  
 -    if ($oldversion < 2018050800.02) {
 +    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, 2018050800.02);
 +        upgrade_main_savepoint(true, 2018050900.01);
      }
  
      return true;