Decouple conversation creation from rendering

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

diff --git a/src/Module/Friendica.php b/src/Module/Friendica.php
index 2c669e886c9e5d74f5e889e50a20b6d85af15fbb..73d5f633cd327c517ff8d6d6eee2ec5f8645b858 100644 (file)
--- a/src/Module/Friendica.php
+++ b/src/Module/Friendica.php
@@ -115,6 +115,8 @@ class Friendica extends BaseModule
 
        protected function rawContent(array $request = [])
        {
+               header('Vary: Accept', false);
+
                // @TODO: Replace with parameter from router
                if (DI::args()->getArgc() <= 1 || (DI::args()->getArgv()[1] !== 'json')) {
                        if (!ActivityPub::isRequest()) {
@@ -172,7 +174,7 @@ class Friendica extends BaseModule
 
                $data = [
                        'version'          => App::VERSION,
-                       'url'              => DI::baseUrl(),
+                       'url'              => (string)DI::baseUrl(),
                        'addons'           => $visible_addons,
                        'locked_features'  => $locked_features,
                        'explicit_content' => intval($config->get('system', 'explicit_content', 0)),