diff --git a/admin/tool/mobile/classes/api.php b/admin/tool/mobile/classes/api.php index f10fb60ce72..436682343ac 100644 --- a/admin/tool/mobile/classes/api.php +++ b/admin/tool/mobile/classes/api.php @@ -202,6 +202,10 @@ class api { $settings->mygradesurl = user_mygrades_url()->out(false); } + if (empty($section) or $section == 'mobileapp') { + $settings->tool_mobile_forcelogout = get_config('tool_mobile', 'forcelogout'); + } + return $settings; } diff --git a/admin/tool/mobile/tests/externallib_test.php b/admin/tool/mobile/tests/externallib_test.php index f145cd04f65..bed4eb03f6d 100644 --- a/admin/tool/mobile/tests/externallib_test.php +++ b/admin/tool/mobile/tests/externallib_test.php @@ -144,6 +144,7 @@ class tool_mobile_external_testcase extends externallib_advanced_testcase { array('name' => 'commentsperpage', 'value' => $CFG->commentsperpage), array('name' => 'disableuserimages', 'value' => $CFG->disableuserimages), array('name' => 'mygradesurl', 'value' => user_mygrades_url()->out(false)), + array('name' => 'tool_mobile_forcelogout', 'value' => 0), ); $this->assertCount(0, $result['warnings']); $this->assertEquals($expected, $result['settings']); @@ -151,8 +152,8 @@ class tool_mobile_external_testcase extends externallib_advanced_testcase { // Change a value and retrieve filtering by section. set_config('commentsperpage', 1); $expected[10]['value'] = 1; - unset($expected[11]); - unset($expected[12]); + // Remove not expected elements. + array_splice($expected, 11); $result = external::get_config('frontpagesettings'); $result = external_api::clean_returnvalue(external::get_config_returns(), $result);