diff options
| author | Mario <mario@mariovavti.com> | 2019-11-22 20:52:55 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2019-11-22 20:52:55 +0000 |
| commit | bdb6b0d237cd503074af0ea313568aa0662c89c2 (patch) | |
| tree | e01b068bf06dc948db0131e762d20b578e07c698 | |
| parent | 73a0866ac4666e615742884a9eb3464c742f787b (diff) | |
| parent | e6b1b2056542735034d24dbe057e1cb1bf9e93e7 (diff) | |
| download | volse-hubzilla-bdb6b0d237cd503074af0ea313568aa0662c89c2.tar.gz volse-hubzilla-bdb6b0d237cd503074af0ea313568aa0662c89c2.tar.bz2 volse-hubzilla-bdb6b0d237cd503074af0ea313568aa0662c89c2.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
| -rw-r--r-- | Zotlabs/Module/Connections.php | 4 | ||||
| -rw-r--r-- | Zotlabs/Module/Viewconnections.php | 4 | ||||
| -rw-r--r-- | include/text.php | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/Zotlabs/Module/Connections.php b/Zotlabs/Module/Connections.php index f9d9c7135..029601867 100644 --- a/Zotlabs/Module/Connections.php +++ b/Zotlabs/Module/Connections.php @@ -292,12 +292,12 @@ class Connections extends \Zotlabs\Web\Controller { } if(intval(get_abconfig(local_channel(),$rr['xchan_hash'],'their_perms','send_stream'))) { $perminfo['connpermcount']++; - $perminfo['connperms'] = ($perminfo['connperms']) ? $perminfo['connperms'] . ',' : $perminfo['connperms'] ; + $perminfo['connperms'] = ($perminfo['connperms']) ? $perminfo['connperms'] . ', ' : $perminfo['connperms'] ; $perminfo['connperms'] .= t('Stream items'); } if(intval(get_abconfig(local_channel(),$rr['xchan_hash'],'their_perms','post_wall'))) { $perminfo['connpermcount']++; - $perminfo['connperms'] = ($perminfo['connperms']) ? $perminfo['connperms'] . ',' : $perminfo['connperms'] ; + $perminfo['connperms'] = ($perminfo['connperms']) ? $perminfo['connperms'] . ', ' : $perminfo['connperms'] ; $perminfo['connperms'] .= t('Wall posts'); } diff --git a/Zotlabs/Module/Viewconnections.php b/Zotlabs/Module/Viewconnections.php index 18a52c247..320a331d1 100644 --- a/Zotlabs/Module/Viewconnections.php +++ b/Zotlabs/Module/Viewconnections.php @@ -84,12 +84,12 @@ class Viewconnections extends \Zotlabs\Web\Controller { } if(intval(get_abconfig(\App::$profile['uid'],$rr['xchan_hash'],'their_perms','send_stream'))) { $perminfo['connpermcount']++; - $perminfo['connperms'] = ($perminfo['connperms']) ? $perminfo['connperms'] . ',' : $perminfo['connperms'] ; + $perminfo['connperms'] = ($perminfo['connperms']) ? $perminfo['connperms'] . ', ' : $perminfo['connperms'] ; $perminfo['connperms'] .= t('Stream items'); } if(intval(get_abconfig(\App::$profile['uid'],$rr['xchan_hash'],'their_perms','post_wall'))) { $perminfo['connpermcount']++; - $perminfo['connperms'] = ($perminfo['connperms']) ? $perminfo['connperms'] . ',' : $perminfo['connperms'] ; + $perminfo['connperms'] = ($perminfo['connperms']) ? $perminfo['connperms'] . ', ' : $perminfo['connperms'] ; $perminfo['connperms'] .= t('Wall posts'); } diff --git a/include/text.php b/include/text.php index d19f4b782..eba41521d 100644 --- a/include/text.php +++ b/include/text.php @@ -1024,17 +1024,17 @@ function contact_block() { } if(intval(get_abconfig(App::$profile['uid'],$rr['xchan_hash'],'their_perms','send_stream'))) { $rr['perminfo']['connpermcount']++; - $rr['perminfo']['connperms'] = ($rr['perminfo']['connperms']) ? $rr['perminfo']['connperms'] . ',' : $rr['perminfo']['connperms'] ; + $rr['perminfo']['connperms'] = ($rr['perminfo']['connperms']) ? $rr['perminfo']['connperms'] . ', ' : $rr['perminfo']['connperms'] ; $rr['perminfo']['connperms'] .= t('Stream items'); } if(intval(get_abconfig(App::$profile['uid'],$rr['xchan_hash'],'their_perms','post_wall'))) { $rr['perminfo']['connpermcount']++; - $rr['perminfo']['connperms'] = ($rr['perminfo']['connperms']) ? $rr['perminfo']['connperms'] . ',' : $rr['perminfo']['connperms'] ; + $rr['perminfo']['connperms'] = ($rr['perminfo']['connperms']) ? $rr['perminfo']['connperms'] . ', ' : $rr['perminfo']['connperms'] ; $rr['perminfo']['connperms'] .= t('Wall posts'); } if ($rr['perminfo']['connpermcount'] == 0) { - $rr['perminfo']['connperms'] .= t('nothing'); + $rr['perminfo']['connperms'] .= t('Nothing'); } $micropro[] = micropro($rr,true,'mpfriend'); |