Merging fix for bug 3848 from stable

This commit is contained in:
moodler 2005-08-09 15:16:23 +00:00
parent 19374e76a5
commit cac429bca4

View File

@ -6027,7 +6027,7 @@ function httpsrequired() {
if (!empty($CFG->loginhttps)) {
$HTTPSPAGEREQUIRED = true;
$CFG->httpswwwroot = str_replace('http', 'https', $CFG->wwwroot);
$CFG->httpswwwroot = str_replace('http:', 'https:', $CFG->wwwroot);
} else {
$CFG->httpswwwroot = $CFG->wwwroot;
}