From 4826b1e42b4d161cb49b99a92e3e008ff76d7f06 Mon Sep 17 00:00:00 2001 From: Mark Nelson Date: Mon, 16 Jul 2018 15:47:11 +0800 Subject: [PATCH] MDL-60435 auth_shibboleth: removed usage of deprecated loginhttps --- auth/shibboleth/auth.php | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/auth/shibboleth/auth.php b/auth/shibboleth/auth.php index dcfde9e1987..174d3fa2493 100644 --- a/auth/shibboleth/auth.php +++ b/auth/shibboleth/auth.php @@ -285,15 +285,9 @@ class auth_plugin_shibboleth extends auth_plugin_base { * @return array List of arrays with keys url, iconurl and name. */ public function loginpage_idp_list($wantsurl) { - global $CFG; $config = get_config('auth_shibboleth'); - if (empty($CFG->loginhttps)) { - $securewwwroot = $CFG->wwwroot; - } else { - $securewwwroot = str_replace('http:', 'https:', $CFG->wwwroot); - } $result = []; - $url = new moodle_url($securewwwroot.'/auth/shibboleth/index.php'); + $url = new moodle_url('/auth/shibboleth/index.php'); $iconurl = moodle_url::make_pluginfile_url(context_system::instance()->id, 'auth_shibboleth', 'logo',