Merge branch 'MDL-60572-33' of git://github.com/jleyva/moodle into MOODLE_33_STABLE

This commit is contained in:
Jun Pataleta
2017-10-30 10:25:24 +13:00
2 changed files with 3 additions and 1 deletions
+1 -1
View File
@@ -128,7 +128,7 @@ class api {
'rememberusername' => $CFG->rememberusername,
'authloginviaemail' => $CFG->authloginviaemail,
'registerauth' => $CFG->registerauth,
'forgottenpasswordurl' => $CFG->forgottenpasswordurl,
'forgottenpasswordurl' => clean_param($CFG->forgottenpasswordurl, PARAM_URL), // We may expect a mailto: here.
'authinstructions' => $authinstructions,
'authnoneenabled' => (int) is_enabled_auth('none'),
'enablewebservices' => $CFG->enablewebservices,