Merge remote-tracking branch 'upstream/develop' into 1607-api-generic-xml

diff --cc include/api.php
index 7a9d91f157c8836979fc0d2a932157fb6247180c,832240f716340b26bed12d96a74477c2e52ba2ab..c3d38e7dd231e742fc3037d926ca9334f2ec275e
--- 1/include/api.php
--- 2/include/api.php
+++ b/include/api.php
@@@ -780,12 -722,9 +784,12 @@@
                        case "atom":
                        case "rss":
                        case "xml":
 +                              //$ret = api_create_xml($data, $templatename);
 +                              //break;
 +
                                $data = array_xmlify($data);
                                if ($templatename==="<auto>") {
-                                       $ret = api_array_to_xml($data); 
+                                       $ret = api_array_to_xml($data);
                                } else {
                                        $tpl = get_markup_template("api_".$templatename."_".$type.".tpl");
                                        if(! $tpl) {