Merge branch 'MDL-59220-32' of git://github.com/damyon/moodle into MOODLE_32_STABLE

2017-09-27 00:52:20 +02:00
parent 4495103f17 074034db86
commit 1dbe5c038e
1 changed files with 5 additions and 1 deletions
@@ -904,7 +904,11 @@ function initialise_fullme() {
    // (That is, the Moodle server uses http, with an external box translating everything to https).
    if (empty($CFG->sslproxy)) {
        if ($rurl['scheme'] === 'http' and $wwwroot['scheme'] === 'https') {
-            print_error('sslonlyaccess', 'error');
+            if (defined('REQUIRE_CORRECT_ACCESS') && REQUIRE_CORRECT_ACCESS) {
+                print_error('sslonlyaccess', 'error');
+            } else {
+                redirect($CFG->wwwroot, get_string('wwwrootmismatch', 'error', $CFG->wwwroot), 3);
+            }
        }
    } else {
        if ($wwwroot['scheme'] !== 'https') {