Move System::jsonExit to BaseModule->jsonExit
- This will ensure headers set in BaseModule->run will be carried in jsonExit scenarios - Deprecate jsonExit() method in Core\System
This commit is contained in:
@@ -32,26 +32,16 @@ use Friendica\DI;
|
||||
class NodeInfo extends BaseModule
|
||||
{
|
||||
protected function rawContent(array $request = [])
|
||||
{
|
||||
self::printWellKnown();
|
||||
}
|
||||
|
||||
/**
|
||||
* Prints the well-known nodeinfo redirect
|
||||
*
|
||||
* @throws \Friendica\Network\HTTPException\NotFoundException
|
||||
*/
|
||||
private static function printWellKnown()
|
||||
{
|
||||
$nodeinfo = [
|
||||
'links' => [
|
||||
['rel' => 'http://nodeinfo.diaspora.software/ns/schema/1.0',
|
||||
'href' => DI::baseUrl() . '/nodeinfo/1.0'],
|
||||
'href' => DI::baseUrl() . '/nodeinfo/1.0'],
|
||||
['rel' => 'http://nodeinfo.diaspora.software/ns/schema/2.0',
|
||||
'href' => DI::baseUrl() . '/nodeinfo/2.0'],
|
||||
'href' => DI::baseUrl() . '/nodeinfo/2.0'],
|
||||
]
|
||||
];
|
||||
|
||||
System::jsonExit($nodeinfo);
|
||||
$this->jsonExit($nodeinfo);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -77,6 +77,6 @@ class XSocialRelay extends BaseModule
|
||||
$relay['protocols']['diaspora'] = ['receive' => DI::baseUrl() . '/receive/public'];
|
||||
}
|
||||
|
||||
System::jsonExit($relay);
|
||||
$this->jsonExit($relay);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user