From 70f3a47e33ddb605af59e29693cea7e936b98b44 Mon Sep 17 00:00:00 2001 From: Juan Leyva Date: Wed, 8 May 2013 11:51:46 +0200 Subject: [PATCH 1/2] MDL-39563 Fixing mobilecssurl is not being returned in WebService get_siteinfo function --- webservice/externallib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webservice/externallib.php b/webservice/externallib.php index c9d1ab5ec2e..3b0990c2283 100644 --- a/webservice/externallib.php +++ b/webservice/externallib.php @@ -157,7 +157,7 @@ class core_webservice_external extends external_api { $siteinfo['functions'] = $availablefunctions; // Mobile CSS theme and alternative login url - $siteinfo['mobilecssurl'] = get_config('admin', 'mobilecssurl'); + $siteinfo['mobilecssurl'] = get_config(NULL, 'mobilecssurl'); return $siteinfo; } From 9184d44dedd8440980f96b010fd17295fa64b74a Mon Sep 17 00:00:00 2001 From: Juan Leyva Date: Thu, 11 Jul 2013 16:25:17 +0200 Subject: [PATCH 2/2] MDL-39563 Fixing mobilecssurl is not being returned in WebService, phpunit tests --- webservice/externallib.php | 4 ++-- webservice/tests/externallib_test.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/webservice/externallib.php b/webservice/externallib.php index 3b0990c2283..6eb7891aeb8 100644 --- a/webservice/externallib.php +++ b/webservice/externallib.php @@ -156,8 +156,8 @@ class core_webservice_external extends external_api { $siteinfo['functions'] = $availablefunctions; - // Mobile CSS theme and alternative login url - $siteinfo['mobilecssurl'] = get_config(NULL, 'mobilecssurl'); + // Mobile CSS theme and alternative login url. + $siteinfo['mobilecssurl'] = get_config(null, 'mobilecssurl'); return $siteinfo; } diff --git a/webservice/tests/externallib_test.php b/webservice/tests/externallib_test.php index 93b550e0a37..75dbd9912c3 100644 --- a/webservice/tests/externallib_test.php +++ b/webservice/tests/externallib_test.php @@ -92,7 +92,7 @@ class core_webservice_external_testcase extends externallib_advanced_testcase { $this->assertEquals(true, $siteinfo['downloadfiles']); $this->assertEquals($CFG->release, $siteinfo['release']); $this->assertEquals($CFG->version, $siteinfo['version']); - $this->assertEquals(get_config('admin', 'mobilecssurl'), $siteinfo['mobilecssurl']); + $this->assertEquals(get_config(null, 'mobilecssurl'), $siteinfo['mobilecssurl']); $this->assertEquals(count($siteinfo['functions']), 1); $function = array_pop($siteinfo['functions']); $this->assertEquals($function['name'], 'core_course_get_contents');