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

[friendica.git] / mod / friendica.php

diff --git a/mod/friendica.php b/mod/friendica.php
index bf3f7942f9eae3f4d8088f52a36ed2a49174ade3..0e647eb5ea18ae31bc28035d54165f83af7b3eef 100644 (file)
--- a/mod/friendica.php
+++ b/mod/friendica.php
@@ -46,18 +46,21 @@ function friendica_init(App $a)
                }
 
                $data = [
-                       'version'         => FRIENDICA_VERSION,
-                       'url'             => System::baseUrl(),
-                       'addons'          => $visible_addons,
-                       'locked_features' => $locked_features,
-                       'register_policy' => $register_policy[intval(Config::get('config', 'register_policy'))],
-                       'admin'           => $admin,
-                       'site_name'       => Config::get('config', 'sitename'),
-                       'platform'        => FRIENDICA_PLATFORM,
-                       'info'            => Config::get('config', 'info'),
-                       'no_scrape_url'   => System::baseUrl().'/noscrape'
+                       'version'          => FRIENDICA_VERSION,
+                       'url'              => System::baseUrl(),
+                       'addons'           => $visible_addons,
+                       'locked_features'  => $locked_features,
+                       'explicit_content' => (int)Config::get('system', 'explicit_content', false),
+                       'language'         => Config::get('system','language'),
+                       'register_policy'  => $register_policy[intval(Config::get('config', 'register_policy'))],
+                       'admin'            => $admin,
+                       'site_name'        => Config::get('config', 'sitename'),
+                       'platform'         => FRIENDICA_PLATFORM,
+                       'info'             => Config::get('config', 'info'),
+                       'no_scrape_url'    => System::baseUrl().'/noscrape'
                ];
 
+               header('Content-type: application/json; charset=utf-8');
                echo json_encode($data);
                killme();
        }