Merge branch 'MDL-62316_oauth_guess_image_fix' of https://github.com/…

…leonstr/moodle
moodle · May 28, 2018 · 77e7c45 · 77e7c45
2 parents c89b495 + 02cc1ec
commit 77e7c45
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/classes/oauth2/api.php b/lib/classes/oauth2/api.php
@@ -349,7 +349,7 @@ public static function get_user_field_mappings(issuer $issuer) {
      * @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);