MDL-58220 auth: $OUTPUT -> $output

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

View File

@ -121,13 +121,12 @@ class login implements renderable, templatable {
}
public function export_for_template(renderer_base $output) {
global $CFG, $OUTPUT;
global $CFG;
$identityproviders = array_map(function($idp) use ($output) {
global $OUTPUT;
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) {
$idp['iconurl'] = $idp['iconurl']->out(false);
}