moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-58220 auth: $OUTPUT -> $output

Browse source 
Don't use global $OUTPUT when there is a more specific renderer.
This commit is contained in:
Damyon Wiese 2017-03-28 12:01:29 +08:00
parent d9fbe3146c
commit e25362a7db
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
auth/classes/output/login.php
View file

@ -121,13 +121,12 @@ class login implements renderable, templatable {
} }
public function export_for_template(renderer_base $output) { public function export_for_template(renderer_base $output) {
global $CFG, $OUTPUT; global $CFG;
$identityproviders = array_map(function($idp) use ($output) { $identityproviders = array_map(function($idp) use ($output) {
global $OUTPUT;
if (!empty($idp['icon'])) { if (!empty($idp['icon'])) {
$idp['iconurl'] = $OUTPUT->pix_url($idp['icon']->key, $idp['icon']->component); $idp['iconurl'] = $output->pix_url($idp['icon']->key, $idp['icon']->component);
} else if ($idp['iconurl'] instanceof moodle_url) { } else if ($idp['iconurl'] instanceof moodle_url) {
$idp['iconurl'] = $idp['iconurl']->out(false); $idp['iconurl'] = $idp['iconurl']->out(false);
} }