L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-52821-master-fix' of github.com:xow/moodle

Browse Source
This commit is contained in:
Andrew Nicols
2016-03-16 12:23:41 +08:00
parent 0aa3fedb23 2a5bb939c2
commit 0758e02e84
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/lti/locallib.php
+2 -2
View File
@@ -502,9 +502,9 @@ function lti_build_standard_request($instance, $orgid, $islti2) {
if (!empty($CFG->mod_lti_institution_name)) {
$requestparams['tool_consumer_instance_name'] = $CFG->mod_lti_institution_name;
} else {
$requestparams['tool_consumer_instance_name'] = get_site()->fullname;
$requestparams['tool_consumer_instance_name'] = get_site()->shortname;
}
$requestparams['tool_consumer_instance_description'] = html_to_text(get_site()->summary, 0);
$requestparams['tool_consumer_instance_description'] = get_site()->fullname;
return $requestparams;
}
mod/lti/tests/externallib_test.php
+2 -2
View File
@@ -95,8 +95,8 @@ class mod_lti_external_testcase extends externallib_advanced_testcase {
self::assertEquals($USER->lastname, $parameters['lis_person_name_family']);
self::assertEquals(fullname($USER), $parameters['lis_person_name_full']);
self::assertEquals($USER->username, $parameters['ext_user_username']);
self::assertEquals("This is a LONG front page summary with html, it should exceed more than seventy-five characters.",
$parameters['tool_consumer_instance_description']);
self::assertEquals("phpunit", $parameters['tool_consumer_instance_name']);
self::assertEquals("PHPUnit test site", $parameters['tool_consumer_instance_description']);
}