aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2018-07-29 06:59:10 +0200
committerMario Vavti <mario@mariovavti.com>2018-07-29 06:59:10 +0200
commit45d262d6c0d976e573abe593d1994dfef590bb61 (patch)
tree9970d3f1c7e2c25a928c6b008123e531766b433b /Zotlabs
parent5dbd11c6edf61f2962a57fa8d4743ba55dfaa5ba (diff)
parentd85c849668c2d0b7e1eb010005e69c02b7b762c4 (diff)
downloadvolse-hubzilla-45d262d6c0d976e573abe593d1994dfef590bb61.tar.gz
volse-hubzilla-45d262d6c0d976e573abe593d1994dfef590bb61.tar.bz2
volse-hubzilla-45d262d6c0d976e573abe593d1994dfef590bb61.zip
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Lib/Apps.php6
-rw-r--r--Zotlabs/Module/Siteinfo.php2
2 files changed, 6 insertions, 2 deletions
diff --git a/Zotlabs/Lib/Apps.php b/Zotlabs/Lib/Apps.php
index ddaf8c44d..f7aff1722 100644
--- a/Zotlabs/Lib/Apps.php
+++ b/Zotlabs/Lib/Apps.php
@@ -332,7 +332,11 @@ class Apps {
'Features' => t('Features'),
'Language' => t('Language'),
'Post' => t('Post'),
- 'Profile Photo' => t('Profile Photo')
+ 'Profile Photo' => t('Profile Photo'),
+ 'Profile' => t('Profile'),
+ 'Profiles' => t('Profiles'),
+ 'Privacy Groups' => t('Privacy Groups'),
+ 'Notifications' => t('Notifications')
);
if(array_key_exists('name',$arr)) {
diff --git a/Zotlabs/Module/Siteinfo.php b/Zotlabs/Module/Siteinfo.php
index 25276815d..79b94662d 100644
--- a/Zotlabs/Module/Siteinfo.php
+++ b/Zotlabs/Module/Siteinfo.php
@@ -32,7 +32,7 @@ class Siteinfo extends \Zotlabs\Web\Controller {
'$transport_link' => '<a href="https://zotlabs.com">https://zotlabs.com</a>',
'$additional_text' => t('Additional federated transport protocols:'),
- '$additional_fed' => implode(',',$federated),
+ '$additional_fed' => implode(', ',array_unique($federated)),
'$prj_version' => ((get_config('system','hidden_version_siteinfo')) ? '' : sprintf( t('Version %s'), \Zotlabs\Lib\System::get_project_version())),
'$prj_linktxt' => t('Project homepage'),
'$prj_srctxt' => t('Developer homepage'),