From 220656e83b2d38a4168f78ec8d9b9ebff9752ebb Mon Sep 17 00:00:00 2001
From: Juan Leyva <juanleyvadelgado@gmail.com>
Date: Mon, 7 Aug 2017 10:58:37 +0200
Subject: [PATCH] MDL-59741 auth: Always check the type of iconurls

We need to check always if iconurl is an instance of moodle_url to
avoid Web Services returning iconurls from identity providers to fail.
---
 lib/authlib.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/authlib.php b/lib/authlib.php
index 657f887971b..4af4bcb0a63 100644
--- a/lib/authlib.php
+++ b/lib/authlib.php
@@ -651,10 +651,10 @@ class auth_plugin_base {
         $data = [];
         foreach ($identityproviders as $idp) {
             if (!empty($idp['icon'])) {
-                // Pre-3.3 auth plugins provide icon as a pix_icon instance.
+                // Pre-3.3 auth plugins provide icon as a pix_icon instance. New auth plugins (since 3.3) provide iconurl.
                 $idp['iconurl'] = $output->image_url($idp['icon']->pix, $idp['icon']->component);
-            } else if ($idp['iconurl'] instanceof moodle_url) {
-                // New auth plugins (since 3.3) provide iconurl.
+            }
+            if ($idp['iconurl'] instanceof moodle_url) {
                 $idp['iconurl'] = $idp['iconurl']->out(false);
             }
             unset($idp['icon']);