mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 22:08:20 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-58836-master' of git://github.com/damyon/moodle

Browse Source
This commit is contained in:
Dan Poltawski 2017-05-10 06:56:42 +01:00
commit fd8d1648a7
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
auth/classes/output/login.php
View File

@ -128,7 +128,7 @@ class login implements renderable, templatable {
$data->error = $this->error; $data->error = $this->error;
$data->forgotpasswordurl = $this->forgotpasswordurl->out(false); $data->forgotpasswordurl = $this->forgotpasswordurl->out(false);
$data->hasidentityproviders = !empty($this->identityproviders); $data->hasidentityproviders = !empty($this->identityproviders);
$data->hasinstructions = !empty($this->instructions); $data->hasinstructions = !empty($this->instructions) || $this->cansignup;
$data->identityproviders = $identityproviders; $data->identityproviders = $identityproviders;
list($data->instructions, $data->instructionsformat) = external_format_text($this->instructions, FORMAT_MOODLE, list($data->instructions, $data->instructionsformat) = external_format_text($this->instructions, FORMAT_MOODLE,
context_system::instance()->id); context_system::instance()->id);

14
login/signup.php
View File

@ -97,5 +97,17 @@ $PAGE->set_heading($SITE->fullname);
echo $OUTPUT->header(); echo $OUTPUT->header();
echo $OUTPUT->render($mform_signup); if ($mform_signup instanceof renderable) {
// Try and use the renderer from the auth plugin if it exists.
try {
$renderer = $PAGE->get_renderer('auth_' . $authplugin->authtype);
} catch (coding_exception $ce) {
// Fall back on the general renderer.
$renderer = $OUTPUT;
}
echo $renderer->render($mform_signup);
} else {
// Fall back for auth plugins not using renderables.
$mform_signup->display();
}
echo $OUTPUT->footer(); echo $OUTPUT->footer();