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

diff --cc webservice/externallib.php
index e8e11de,4fcce61..4daf434
--- 1/webservice/externallib.php
--- 2/webservice/externallib.php
+++ b/webservice/externallib.php
@@@ -206,10 -206,8 +206,11 @@@ class core_webservice_external extends 
          } else {
              $siteinfo['usercalendartype'] = $USER->calendartype;
          }
+         $siteinfo['userissiteadmin'] = is_siteadmin();
  
 +        // User key, to avoid using the WS token for fetching assets.
 +        $siteinfo['userprivateaccesskey'] = get_user_key('core_files', $USER->id);
 +
          // Current theme.
          $siteinfo['theme'] = clean_param($PAGE->theme->name, PARAM_THEME);  // We always clean to avoid problem with old sites.
  

diff --cc webservice/tests/externallib_test.php
Simple merge

diff --cc webservice/upgrade.txt
index 14ce75e,0ec01b1..6f92dd3
--- 1/webservice/upgrade.txt
--- 2/webservice/upgrade.txt
+++ b/webservice/upgrade.txt
@@@ -9,9 -9,8 +9,11 @@@ This information is intended for author
    is passed and the web service call does not require the user to be logged in we will attempt to use GET for the
    request. This allows for things like proxy caching on URLs. The cache key must be changed if we do not want to
    retrieve what has been cached and want to perform the request again.
 +* External function core_webservice_external::get_site_info() now returns the user private access key "userprivateaccesskey".
 +  This key could be used for fetching files via the tokenpluginfile.php script instead webservice/pluginfile.php to avoid
 +  multiple GET requests that include the WS token as a visible parameter.
+ * External function core_webservice_external::get_site_info() now returns a new field "userissiteadmin" indicating if
+   the current user is a site administrator.
  
  === 3.7 ===