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

Merge branch 'MDL-77643-master' of https://github.com/jleyva/moodle

Browse Source
This commit is contained in:
Paul Holden
2023-03-22 12:38:02 +00:00
parent 775872450c bba614a5eb
commit 054a6fa9b4
3 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/tool/mobile/classes/api.php
+5
View File
@@ -360,6 +360,11 @@ class api {
$settings->customusermenuitems = $CFG->customusermenuitems;
}
if (empty($section) || $section === 'locationsettings') {
$settings->timezone = $CFG->timezone;
$settings->forcetimezone = $CFG->forcetimezone;
}
return $settings;
}
admin/tool/mobile/tests/externallib_test.php
+2
View File
@@ -254,6 +254,8 @@ class externallib_test extends externallib_advanced_testcase {
$expected[] = ['name' => 'enabledashboard', 'value' => $CFG->enabledashboard];
$expected[] = ['name' => 'customusermenuitems', 'value' => $CFG->customusermenuitems];
$expected[] = ['name' => 'timezone', 'value' => $CFG->timezone];
$expected[] = ['name' => 'forcetimezone', 'value' => $CFG->forcetimezone];
$this->assertCount(0, $result['warnings']);
$this->assertEquals($expected, $result['settings']);
admin/tool/mobile/upgrade.txt
+4
View File
@@ -1,6 +1,10 @@
This files describes changes in tool_mobile code.
Information provided here is intended especially for developers.
=== 4.2 ===
* External function tool_mobile::get_config now returns the timezone and forcetimezone settings.
=== 4.1 ===
* External function tool_mobile::get_config now returns the customusermenuitems setting.