Merge branch 'w51_MDL-30613_m22_FULLME' of git://github.com/skodak/moodle into MOODLE_22_STABLE

This commit is contained in:
Aparup Banerjee 2011-12-12 15:05:37 +08:00
commit b750cfde81
4 changed files with 10 additions and 4 deletions

View file

@ -1127,8 +1127,8 @@ function lti_get_launch_container($lti, $toolconfig) {
}
function lti_request_is_using_ssl() {
global $FULLME;
return (stripos($FULLME, 'https://') === 0);
global $CFG;
return (stripos($CFG->httpswwwroot, 'https://') === 0);
}
function lti_ensure_url_is_https($url) {