From: Michael <heluecht@pirati.ca>
Date: Wed, 15 Mar 2017 14:37:30 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/develop' into 1601-api-statuses-lookup
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8e12b159d947fb27ad6bdd5e06e3a90c1713687e;p=friendica.git

Merge remote-tracking branch 'upstream/develop' into 1601-api-statuses-lookup
---

8e12b159d947fb27ad6bdd5e06e3a90c1713687e
diff --cc include/api.php
index 887b449fc0,701e527cc8..08bd835f3b
--- a/include/api.php
+++ b/include/api.php
@@@ -2558,18 -2726,8 +2727,9 @@@ use \Friendica\Core\Config
  		// liar
  		$fake_statusnet_version = "0.9.7";
  
- 		if($type === 'xml') {
- 			header("Content-type: application/xml");
- 			echo '<?xml version="1.0" encoding="UTF-8"?>' . "\r\n" . '<version>'.$fake_statusnet_version.'</version>' . "\r\n";
- 			killme();
- 		}
- 		elseif($type === 'json') {
- 			header("Content-type: application/json");
- 			echo '"'.$fake_statusnet_version.'"';
- 			killme();
- 		}
+ 		return api_format_data('version', $type, array('version' => $fake_statusnet_version));
  	}
 +	api_register_func('api/gnusocial/version','api_statusnet_version',false);
  	api_register_func('api/statusnet/version','api_statusnet_version',false);
  
  	/**