Merge branch 'MDL-66740-master' of git://github.com/marinaglancy/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Fri, 18 Oct 2019 03:06:55 +0000 (11:06 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Fri, 18 Oct 2019 03:06:55 +0000 (11:06 +0800)
1  2 
lib/db/upgrade.php
version.php

@@@ -3611,5 -3609,13 +3611,13 @@@ function xmldb_main_upgrade($oldversion
          upgrade_main_savepoint(true, 2019100900.00);
      }
  
 -    if ($oldversion < 2019101200.01) {
++    if ($oldversion < 2019101600.01) {
+         // Change the setting $CFG->requestcategoryselection into $CFG->lockrequestcategory with opposite value.
+         set_config('lockrequestcategory', !$CFG->requestcategoryselection);
 -        upgrade_main_savepoint(true, 2019101200.01);
++        upgrade_main_savepoint(true, 2019101600.01);
+     }
      return true;
  }
diff --cc version.php
@@@ -29,7 -29,7 +29,7 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
- $version  = 2019101600.00;              // YYYYMMDD      = weekly release date of this DEV branch.
 -$version  = 2019101200.01;              // YYYYMMDD      = weekly release date of this DEV branch.
++$version  = 2019101600.01;              // YYYYMMDD      = weekly release date of this DEV branch.
                                          //         RR    = release increments - 00 in DEV branches.
                                          //           .XX = incremental changes.