Merge branch 'MDL-65893-36' of https://github.com/nicoroeser/moodle into MOODLE_36_STABLE

This commit is contained in:
Jake Dallimore
2019-06-24 11:42:53 +08:00
+2 -1
View File
@@ -77,6 +77,7 @@ class core_webservice_external extends external_api {
array('serviceshortnames'=>$serviceshortnames));
$context = context_user::instance($USER->id);
$systemcontext = context_system::instance();
$userpicture = new user_picture($USER);
$userpicture->size = 1; // Size f1.
@@ -84,7 +85,7 @@ class core_webservice_external extends external_api {
// Site information.
$siteinfo = array(
'sitename' => $SITE->fullname,
'sitename' => external_format_string($SITE->fullname, $systemcontext),
'siteurl' => $CFG->wwwroot,
'username' => $USER->username,
'firstname' => $USER->firstname,