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-59012-master-linkurl' of git://github.com/mudrd8mz/moodle

Browse Source
This commit is contained in:
Jun Pataleta 2017-06-14 17:11:36 +08:00 committed by Dan Poltawski
commit e037a6a126
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
auth/oauth2/classes/api.php
View File

@ -192,10 +192,10 @@ class api {
]; ];
$confirmationurl = new moodle_url('/auth/oauth2/confirm-linkedlogin.php', $params); $confirmationurl = new moodle_url('/auth/oauth2/confirm-linkedlogin.php', $params);
// Remove data parameter just in case it was included in the confirmation so we can add it manually later. $data->link = $confirmationurl->out(false);
$data->link = $confirmationurl->out(); $message = get_string('confirmlinkedloginemail', 'auth_oauth2', $data);
$message = get_string('confirmlinkedloginemail', 'auth_oauth2', $data); $data->link = $confirmationurl->out();
$messagehtml = text_to_html(get_string('confirmlinkedloginemail', 'auth_oauth2', $data), false, false, true); $messagehtml = text_to_html(get_string('confirmlinkedloginemail', 'auth_oauth2', $data), false, false, true);
$user->mailformat = 1; // Always send HTML version as well. $user->mailformat = 1; // Always send HTML version as well.
@ -303,9 +303,10 @@ class api {
]; ];
$confirmationurl = new moodle_url('/auth/oauth2/confirm-account.php', $params); $confirmationurl = new moodle_url('/auth/oauth2/confirm-account.php', $params);
$data->link = $confirmationurl->out(); $data->link = $confirmationurl->out(false);
$message = get_string('confirmaccountemail', 'auth_oauth2', $data);
$message = get_string('confirmaccountemail', 'auth_oauth2', $data); $data->link = $confirmationurl->out();
$messagehtml = text_to_html(get_string('confirmaccountemail', 'auth_oauth2', $data), false, false, true); $messagehtml = text_to_html(get_string('confirmaccountemail', 'auth_oauth2', $data), false, false, true);
$user->mailformat = 1; // Always send HTML version as well. $user->mailformat = 1; // Always send HTML version as well.