From bba614a5eb42f83d82bb5591310de3b470b13487 Mon Sep 17 00:00:00 2001
From: Juan Leyva <juanleyvadelgado@gmail.com>
Date: Wed, 15 Mar 2023 16:14:21 +0100
Subject: [PATCH] MDL-77643 tool_mobile: Return location settings

---
 admin/tool/mobile/classes/api.php            | 5 +++++
 admin/tool/mobile/tests/externallib_test.php | 2 ++
 admin/tool/mobile/upgrade.txt                | 4 ++++
 3 files changed, 11 insertions(+)

diff --git a/admin/tool/mobile/classes/api.php b/admin/tool/mobile/classes/api.php
index ca83c4fef89..d7040ba6438 100644
--- a/admin/tool/mobile/classes/api.php
+++ b/admin/tool/mobile/classes/api.php
@@ -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;
     }
 
diff --git a/admin/tool/mobile/tests/externallib_test.php b/admin/tool/mobile/tests/externallib_test.php
index fe793150e36..7d53ccbb9ce 100644
--- a/admin/tool/mobile/tests/externallib_test.php
+++ b/admin/tool/mobile/tests/externallib_test.php
@@ -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']);
diff --git a/admin/tool/mobile/upgrade.txt b/admin/tool/mobile/upgrade.txt
index 9495d7ac1cd..2efa8c23940 100644
--- a/admin/tool/mobile/upgrade.txt
+++ b/admin/tool/mobile/upgrade.txt
@@ -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.