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

Merge branch 'MDL-70080-39' of git://github.com/jleyva/moodle into MOODLE_39_STABLE

Browse Source
This commit is contained in:
Andrew Nicols
2020-12-03 11:55:54 +08:00
parent dd96341354 b1a4bd579a
commit 7bc67e92e2
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/tool/mobile/classes/api.php
+6
View File
@@ -322,6 +322,12 @@ class api {
}
}
if (empty($section) or $section == 'supportcontact') {
$settings->supportname = $CFG->supportname;
$settings->supportemail = $CFG->supportemail;
$settings->supportpage = $CFG->supportpage;
}
return $settings;
}
admin/tool/mobile/tests/externallib_test.php
+4
View File
@@ -229,6 +229,10 @@ class tool_mobile_external_testcase extends externallib_advanced_testcase {
'value' => get_config('core_admin', 'coursecolor' . $number)
];
}
$expected[] = ['name' => 'supportname', 'value' => $CFG->supportname];
$expected[] = ['name' => 'supportemail', 'value' => $CFG->supportemail];
$expected[] = ['name' => 'supportpage', 'value' => $CFG->supportpage];
$this->assertCount(0, $result['warnings']);
$this->assertEquals($expected, $result['settings']);