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

moodle · Jun 29, 2016 · 628c52e · 628c52e
2 parents 3654734 + 89823b1
commit 628c52e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/webservice/lib.php b/webservice/lib.php
@@ -460,7 +460,8 @@ public function get_external_functions($serviceids) {
                       FROM {external_functions} f
                      WHERE f.name IN (SELECT sf.functionname
                                         FROM {external_services_functions} sf
-                                       WHERE sf.externalserviceid $serviceids)";
+                                       WHERE sf.externalserviceid $serviceids)
+                     ORDER BY f.name ASC";
             $functions = $DB->get_records_sql($sql, $params);
         } else {
             $functions = array();

diff --git a/webservice/upgrade.txt b/webservice/upgrade.txt
@@ -3,6 +3,10 @@ information provided here is intended especially for developers.
 
 This information is intended for authors of webservices, not people writing webservice clients.
 
+=== 3.2 ===
+
+* webservice->get_external_functions now returns the external function list ordered by name ASC.
+
 === 3.1 ===
 
 * The xmlrpc backend has changed, Zend_XmlRpc has been dropped and there might be slight differences in