Merge branch 'MDL-56160-master' of git://github.com/dpalou/moodle

moodle · Oct 3, 2016 · ed66d72 · ed66d72
2 parents e22ce8a + 43695b6
commit ed66d72
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/webservice/externallib.php b/webservice/externallib.php
@@ -92,7 +92,8 @@ public static function get_site_info($serviceshortnames = array()) {
             'fullname' => fullname($USER),
             'lang' => current_language(),
             'userid' => $USER->id,
-            'userpictureurl' => $profileimageurl->out(false)
+            'userpictureurl' => $profileimageurl->out(false),
+            'siteid' => SITEID
         );
 
         // Retrieve the service and functions from the web service linked to the token
@@ -257,7 +258,8 @@ public static function get_site_info_returns() {
                                             VALUE_OPTIONAL),
                 'userhomepage' => new external_value(PARAM_INT,
                                                         'the default home page for the user: 0 for the site home, 1 for dashboard',
-                                                        VALUE_OPTIONAL)
+                                                        VALUE_OPTIONAL),
+                'siteid'  => new external_value(PARAM_INT, 'Site course ID', VALUE_OPTIONAL)
             )
         );
     }

diff --git a/webservice/tests/externallib_test.php b/webservice/tests/externallib_test.php
@@ -95,6 +95,7 @@ public function test_get_site_info() {
         $this->assertEquals('Doe', $siteinfo['lastname']);
         $this->assertEquals(current_language(), $siteinfo['lang']);
         $this->assertEquals($USER->id, $siteinfo['userid']);
+        $this->assertEquals(SITEID, $siteinfo['siteid']);
         $this->assertEquals(true, $siteinfo['downloadfiles']);
         $this->assertEquals($CFG->release, $siteinfo['release']);
         $this->assertEquals($CFG->version, $siteinfo['version']);

diff --git a/webservice/upgrade.txt b/webservice/upgrade.txt
@@ -11,6 +11,7 @@ This information is intended for authors of webservices, not people writing webs
 * external_format_text() function: component, filearea and itemid are now optional parameters.
   In some contexts those parameteres are not necessary because is not required to do a file rewrite via
   file_rewrite_pluginfile_urls.
+* External function get_site_info now returns the site course ID. This new field is marked as VALUE_OPTIONAL for backwards compatibility.
 
 === 3.1 ===