From: Michael Vogel <icarus@dabo.de>
Date: Fri, 15 Jul 2016 14:15:20 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/develop' into 1607-api-generic-xml
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=4e25d08a77f6a16fc701392d9e450b33b125fa32;p=friendica.git

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

4e25d08a77f6a16fc701392d9e450b33b125fa32
diff --cc include/api.php
index 7a9d91f157,832240f716..c3d38e7dd2
--- a/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) {