diff options
| author | Mario <mario@mariovavti.com> | 2019-10-01 11:15:29 +0200 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2019-10-01 11:15:29 +0200 |
| commit | 79b05e48e8ef904bd386f4c8433ca02830ccdc71 (patch) | |
| tree | 41448004a16cdf449dce48fa760265136a600a54 /Zotlabs | |
| parent | 97b161c5366387b86ee8ac245ef92624e52c5ea2 (diff) | |
| parent | 541146e8ce90d09180dc8c3328482383e42c3738 (diff) | |
| download | volse-hubzilla-79b05e48e8ef904bd386f4c8433ca02830ccdc71.tar.gz volse-hubzilla-79b05e48e8ef904bd386f4c8433ca02830ccdc71.tar.bz2 volse-hubzilla-79b05e48e8ef904bd386f4c8433ca02830ccdc71.zip | |
Merge branch 'dev' into 'dev'
Add 'Connect' button for not connected at this location channels
See merge request hubzilla/core!1743
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Module/Connections.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Zotlabs/Module/Connections.php b/Zotlabs/Module/Connections.php index 7c8d71210..fd645d239 100644 --- a/Zotlabs/Module/Connections.php +++ b/Zotlabs/Module/Connections.php @@ -322,7 +322,10 @@ class Connections extends \Zotlabs\Web\Controller { 'ignore' => ((! $rr['abook_ignored']) ? t('Ignore') : false), 'recent_label' => t('Recent activity'), 'recentlink' => z_root() . '/network/?f=&cid=' . intval($rr['abook_id']) . '&name=' . $rr['xchan_name'], - 'oneway' => $oneway + 'oneway' => $oneway, + 'connect' => (intval($rr['abook_not_here']) ? t('Connect') : ''), + 'follow' => z_root() . '/follow/?f=&url=' . urlencode($rr['xchan_addr']) . '&interactive=0', + 'connect_hover' => t('Connect at this location') ); } } |