aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRedMatrix <info@friendica.com>2014-10-03 18:51:16 +1000
committerRedMatrix <info@friendica.com>2014-10-03 18:51:16 +1000
commitdfd39ebb3cccfdce8fb6d58128279cac05cbb8e4 (patch)
tree26f2be292c1c4b06d59e21d3ec6bb686199d9cd0
parentdf70c2c9b62365c9b0feb8a482aef1ac626fabd6 (diff)
parent9495aba49920d3eac8d53095aed3b4de3820e4cb (diff)
downloadvolse-hubzilla-dfd39ebb3cccfdce8fb6d58128279cac05cbb8e4.tar.gz
volse-hubzilla-dfd39ebb3cccfdce8fb6d58128279cac05cbb8e4.tar.bz2
volse-hubzilla-dfd39ebb3cccfdce8fb6d58128279cac05cbb8e4.zip
Merge pull request #611 from tuscanhobbit/dev
site language in siteinfo/json has been re-added
-rw-r--r--mod/siteinfo.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/mod/siteinfo.php b/mod/siteinfo.php
index 3071e52fb..de55c69cf 100644
--- a/mod/siteinfo.php
+++ b/mod/siteinfo.php
@@ -63,6 +63,7 @@ function siteinfo_init(&$a) {
'plugins' => $visible_plugins,
'register_policy' => $register_policy[$a->config['system']['register_policy']],
'directory_mode' => $directory_mode[$a->config['system']['directory_mode']],
+ 'language' => get_config('system','language'),
'diaspora_emulation' => get_config('system','diaspora_enabled'),
'rss_connections' => get_config('system','feed_contacts'),
'default_service_restrictions' => $service_class,