From 02cc1ecd771f5e53831bb9a9eb01caa01eb6a600 Mon Sep 17 00:00:00 2001 From: Leon Stringer Date: Tue, 22 May 2018 17:43:05 +0100 Subject: [PATCH] MDL-62316 OAuth 2: Only guess image if base URL set. If you added an OAuth 2 service with no base URL guess_image() would try to parse this empty value looking for a favicon.ico. We now check if the base URL is empty beforehand and skip this if so. --- lib/classes/oauth2/api.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/classes/oauth2/api.php b/lib/classes/oauth2/api.php index b10af6c6555..72d4e978540 100644 --- a/lib/classes/oauth2/api.php +++ b/lib/classes/oauth2/api.php @@ -349,7 +349,7 @@ class api { * @param \core\oauth2\issuer $issuer The desired OAuth issuer */ protected static function guess_image($issuer) { - if (empty($issuer->get('image'))) { + if (empty($issuer->get('image')) && !empty($issuer->get('baseurl'))) { $baseurl = parse_url($issuer->get('baseurl')); $imageurl = $baseurl['scheme'] . '://' . $baseurl['host'] . '/favicon.ico'; $issuer->set('image', $imageurl);