Merge remote-tracking branch 'upstream/develop' into api4

[friendica.git] / src / Module / NodeInfo110.php

diff --git a/src/Module/NodeInfo110.php b/src/Module/NodeInfo110.php
index 954f362190995d0a88088d4b30e10976ee28b9d3..d8f8a5049a3c1ee42051f4af3cd4c56ecb8824a2 100644 (file)
--- a/src/Module/NodeInfo110.php
+++ b/src/Module/NodeInfo110.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -23,6 +23,7 @@ namespace Friendica\Module;
 
 use Friendica\BaseModule;
 use Friendica\Core\Addon;
+use Friendica\Core\System;
 use Friendica\DI;
 use Friendica\Model\Nodeinfo;
 
@@ -32,7 +33,7 @@ use Friendica\Model\Nodeinfo;
  */
 class NodeInfo110 extends BaseModule
 {
-       public static function rawContent(array $parameters = [])
+       public function rawContent()
        {
                $config = DI::config();
 
@@ -85,8 +86,6 @@ class NodeInfo110 extends BaseModule
 
                $nodeinfo['metadata']['explicitContent'] = $config->get('system', 'explicit_content', false) == true;
 
-               header('Content-type: application/json; charset=utf-8');
-               echo json_encode($nodeinfo, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
-               exit;
+               System::jsonExit($nodeinfo, 'application/json; charset=utf-8', JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
        }
 }