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

2018-05-28 16:46:30 +02:00
parent c89b495650 02cc1ecd77
commit 77e7c45487
1 changed files with 1 additions and 1 deletions
@@ -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);