From 92fa81d387ffd9fc1cf28ef5ae90682ea8c19304 Mon Sep 17 00:00:00 2001 From: Jerome Mouneyrac Date: Fri, 2 Nov 2012 18:03:20 +0800 Subject: [PATCH] MDL-35998 get_site_info return current_language() --- webservice/externallib.php | 2 ++ webservice/tests/externallib_test.php | 1 + 2 files changed, 3 insertions(+) diff --git a/webservice/externallib.php b/webservice/externallib.php index f1d7a682b5f..095638633a2 100644 --- a/webservice/externallib.php +++ b/webservice/externallib.php @@ -87,6 +87,7 @@ class core_webservice_external extends external_api { 'firstname' => $USER->firstname, 'lastname' => $USER->lastname, 'fullname' => fullname($USER), + 'lang' => current_language(), 'userid' => $USER->id, 'userpictureurl' => $profileimageurl->out(false) ); @@ -175,6 +176,7 @@ class core_webservice_external extends external_api { 'firstname' => new external_value(PARAM_TEXT, 'first name'), 'lastname' => new external_value(PARAM_TEXT, 'last name'), 'fullname' => new external_value(PARAM_TEXT, 'user full name'), + 'lang' => new external_value(PARAM_LANG, 'user language'), 'userid' => new external_value(PARAM_INT, 'user id'), 'siteurl' => new external_value(PARAM_RAW, 'site url'), 'userpictureurl' => new external_value(PARAM_URL, 'the user profile picture. diff --git a/webservice/tests/externallib_test.php b/webservice/tests/externallib_test.php index 004ae8531fe..38680875e05 100644 --- a/webservice/tests/externallib_test.php +++ b/webservice/tests/externallib_test.php @@ -80,6 +80,7 @@ class core_webservice_external_testcase extends externallib_advanced_testcase { $this->assertEquals('johnd', $siteinfo['username']); $this->assertEquals('John', $siteinfo['firstname']); $this->assertEquals('Doe', $siteinfo['lastname']); + $this->assertEquals(current_language(), $siteinfo['lang']); $this->assertEquals($USER->id, $siteinfo['userid']); $this->assertEquals(true, $siteinfo['downloadfiles']); $this->assertEquals($CFG->release, $siteinfo['release']);