Merge pull request #6080 from annando/issue-6074

Issue 6074: Language and "explicit" are now exported
This commit is contained in:
Hypolite Petovan 2018-11-05 13:47:40 -05:00 committed by GitHub
commit e53bba0457
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -50,7 +50,9 @@ function friendica_init(App $a)
'url' => System::baseUrl(), 'url' => System::baseUrl(),
'addons' => $visible_addons, 'addons' => $visible_addons,
'locked_features' => $locked_features, 'locked_features' => $locked_features,
'register_policy' => $register_policy[intval(Config::get('config', 'register_policy'))], '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, 'admin' => $admin,
'site_name' => Config::get('config', 'sitename'), 'site_name' => Config::get('config', 'sitename'),
'platform' => FRIENDICA_PLATFORM, 'platform' => FRIENDICA_PLATFORM,
@ -58,6 +60,7 @@ function friendica_init(App $a)
'no_scrape_url' => System::baseUrl().'/noscrape' 'no_scrape_url' => System::baseUrl().'/noscrape'
]; ];
header('Content-type: application/json; charset=utf-8');
echo json_encode($data); echo json_encode($data);
killme(); killme();
} }