Merge branch '1509-diaspora-import' of github.com:annando/friendica into 1509-diaspora-import

This commit is contained in:
Michael Vogel 2015-09-05 12:13:38 +02:00
commit 6aac9dfc9c
8 changed files with 1033 additions and 1011 deletions

View file

@ -10,8 +10,8 @@ function nodeinfo_wellknown(&$a) {
http_status_exit(404);
killme();
}
$nodeinfo = array("links" => array("rel" => "http://nodeinfo.diaspora.software/ns/schema/1.0",
"href" => $a->get_baseurl()."/nodeinfo/1.0"));
$nodeinfo = array("links" => array(array("rel" => "http://nodeinfo.diaspora.software/ns/schema/1.0",
"href" => $a->get_baseurl()."/nodeinfo/1.0")));
header('Content-type: application/json; charset=utf-8');
echo json_encode($nodeinfo, JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES);