Merge branch 'MDL-42834_master' of git://github.com/markn86/moodle
authorJake Dallimore <jake@moodle.com>
Mon, 23 Oct 2017 05:25:35 +0000 (13:25 +0800)
committerJake Dallimore <jake@moodle.com>
Mon, 23 Oct 2017 05:25:35 +0000 (13:25 +0800)
1  2 
lib/db/upgrade.php
version.php

@@@ -2781,5 -2781,17 +2781,17 @@@ function xmldb_main_upgrade($oldversion
          upgrade_main_savepoint(true, 2017101900.02);
      }
  
 -    if ($oldversion < 2017101900.03) {
++    if ($oldversion < 2017102100.01) {
+         // We will need to force them onto ssl if loginhttps is set.
+         if (!empty($CFG->loginhttps)) {
+             set_config('overridetossl', 1);
+         }
+         // Loginhttps should no longer be set.
+         unset_config('loginhttps');
+         // Main savepoint reached.
 -        upgrade_main_savepoint(true, 2017101900.03);
++        upgrade_main_savepoint(true, 2017102100.01);
+     }
      return true;
  }
diff --cc version.php
@@@ -29,7 -29,7 +29,7 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
- $version  = 2017102100.00;              // YYYYMMDD      = weekly release date of this DEV branch.
 -$version  = 2017101900.03;              // YYYYMMDD      = weekly release date of this DEV branch.
++$version  = 2017102100.01;              // YYYYMMDD      = weekly release date of this DEV branch.
                                          //         RR    = release increments - 00 in DEV branches.
                                          //           .XX = incremental changes.