L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-59741 auth: Always check the type of iconurls

Browse Source 
We need to check always if iconurl is an instance of moodle_url to
avoid Web Services returning iconurls from identity providers to fail.
This commit is contained in:
Juan Leyva
2017-08-07 10:58:37 +02:00
parent d509f80c48
commit 220656e83b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/authlib.php
+3 -3
View File
@@ -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']);