Merge branch 'MDL-39563' of git://github.com/jleyva/moodle

This commit is contained in:
Damyon Wiese 2013-07-15 14:54:20 +08:00
commit 4d4b938fa3
2 changed files with 3 additions and 3 deletions

View File

@ -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('admin', 'mobilecssurl');
// Mobile CSS theme and alternative login url.
$siteinfo['mobilecssurl'] = get_config(null, 'mobilecssurl');
return $siteinfo;
}

View File

@ -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');